From 69a478752642e32ee36e84c1c1502cf44c2e86b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eray=20=C3=96zkural?= <eray@pardus.org.tr>
Date: Thu, 3 Nov 2005 02:20:47 +0000
Subject: [PATCH] * autoxml r0xX0rz!   - convert Index to automxl   - add error
 handling, too :)   - update the code path for api.index   - fix: type of
 packageURI

---
 pisi/api.py      |  2 +-
 pisi/index.py    | 42 ++++++++++++++++++++----------------------
 pisi/metadata.py |  2 +-
 3 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/pisi/api.py b/pisi/api.py
index 78dfe8cf..8438e87f 100644
--- a/pisi/api.py
+++ b/pisi/api.py
@@ -244,7 +244,7 @@ def update_repo(repo):
 
     ctx.ui.info(_('* Updating repository: %s') % repo)
     index = Index()
-    index.read(ctx.repodb.get_repo(repo).indexuri.get_uri(), repo)
+    index.read_uri(ctx.repodb.get_repo(repo).indexuri.get_uri(), repo)
     index.update_db(repo)
     ctx.ui.info(_('\n* Package database updated.'))
 
diff --git a/pisi/index.py b/pisi/index.py
index 58ab6148..edfc3da7 100644
--- a/pisi/index.py
+++ b/pisi/index.py
@@ -21,29 +21,36 @@ import gettext
 __trans = gettext.translation('pisi', fallback=True)
 _ = __trans.ugettext
 
+import pisi
 import pisi.context as ctx
+import pisi.specfile as specfile
 import pisi.metadata as metadata
 import pisi.packagedb as packagedb
 import pisi.util as util
 from pisi.package import Package
 from pisi.xmlfile import XmlFile
+import pisi.xmlfile as xmlfile
 from pisi.uri import URI
 
+class Error(pisi.Error):
+    pass
+
 class Index(XmlFile):
+    __metaclass__ = xmlfile.autoxml
 
-    def __init__(self):
-        XmlFile.__init__(self,"PISI")
-        self.sources = []
-        self.packages = []
+    tag = "PISI"
 
-    def read(self, filename, repo = None):
+    t_Sources = [ [specfile.Source], xmlfile.optional, "Source"]
+    t_Packages = [ [metadata.Package], xmlfile.optional, "Package"]
+
+    def read_uri(self, filename, repo = None):
         """Read PSPEC file"""
 
         self.filepath = filename
         url = URI(filename)
         if url.is_remote_file():
             from fetcher import fetch_url
-
+            assert repo
             dest = os.path.join(ctx.config.index_dir(), repo)
             if not os.path.exists(dest):
                 os.makedirs(dest)
@@ -51,22 +58,8 @@ class Index(XmlFile):
 
             self.filepath = os.path.join(dest, url.filename())
 
-        self.readxml(self.filepath)
+        self.read(self.filepath)
 
-        # find all binary packages
-        packageElts = self.getAllNodes("Package")
-        self.packages = [metadata.PackageInfo(p) for p in packageElts]
-        
-        self.unlink()
-    
-    def write(self, filename):
-        """Write index file"""
-        self.newDOM()
-        for pkg in self.packages:
-            self.addChild(pkg.elt(self))
-        self.writexml(filename)
-        self.unlink()
-        
     def index(self, repo_uri):
         self.repo_dir = repo_uri
         for root, dirs, files in os.walk(repo_uri):
@@ -97,7 +90,12 @@ class Index(XmlFile):
             # function.
             md.package.packageURI = util.removepathprefix(repo_uri, path)
         # check package semantics
-        if md.has_errors():
+        errs = md.errors()
+        if md.errors():
             ctx.ui.error(_('Package %s: metadata corrupt') % md.package.name)
+            ctx.ui.error(str(Error(*errs)))
         else:
             self.packages.append(md.package)
+
+    #TODO: add source
+    
diff --git a/pisi/metadata.py b/pisi/metadata.py
index 813afbee..327348c4 100644
--- a/pisi/metadata.py
+++ b/pisi/metadata.py
@@ -60,7 +60,7 @@ class Package:
     t_DistributionRelease = [ xmlfile.String, xmlfile.mandatory]
     t_Architecture = [ xmlfile.String, xmlfile.mandatory]
     t_InstalledSize = [ xmlfile.Integer, xmlfile.mandatory]
-    t_PackageURI = [ xmlfile.Integer, xmlfile.optional]
+    t_PackageURI = [ xmlfile.String, xmlfile.optional]
 
     def decode_hook(self, node, errs, where):
         self.version = self.history[0].version