From e921de2f967e9171b361cd0068c3e78c6a6fe00e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCrer=20=C3=96zen?= <gurer@pardus.org.tr>
Date: Wed, 19 Apr 2006 06:26:53 +0000
Subject: [PATCH] =?UTF-8?q?g=C3=BCncelleme,=20bunlar=C4=B1=20kullanmak=20i?=
 =?UTF-8?q?=C3=A7in=20autoxml=20de=20ufak=20bi=20pe=C3=A7=20laz=C4=B1m,=20?=
 =?UTF-8?q?onu=20ayr=C4=B1ca=20koyucam=20test=20etmeden=20aktive=20etmiyor?=
 =?UTF-8?q?um?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

minidom implementasyonu da çalışmıyor bu arada
---
 pisi/pxml/xmlextpiks.py  |  99 ++++++++++++++------------------
 pisi/pxml/xmlfilepiks.py | 118 ++++++++-------------------------------
 2 files changed, 66 insertions(+), 151 deletions(-)

diff --git a/pisi/pxml/xmlextpiks.py b/pisi/pxml/xmlextpiks.py
index 0fc1a183..3a376713 100644
--- a/pisi/pxml/xmlextpiks.py
+++ b/pisi/pxml/xmlextpiks.py
@@ -9,17 +9,17 @@
 #
 # Please read the COPYING file.
 #
-# Authors:  Eray Ozkural <eray@pardus.org.tr>
-#           Baris Metin <baris@pardus.org.tr
-#           Gurer Ozen <gurer@pardus.org.tr>
 
 """
- some helper functions for high-level access to XML structures
-
- this implementation uses piksemel, a fast C-based XML library
+ xmlext is a helper module for accessing XML files using
+ xml.dom.minidom . It is a convenient wrapper for some
+ DOM functions, and provides path based get/add functions
+ as in KDE API.
 
  function names are mixedCase for compatibility with minidom,
- an old library
+ an 'old library'
+
+ this implementation uses piksemel
 """
 
 import gettext
@@ -27,11 +27,23 @@ __trans = gettext.translation('pisi', fallback=True)
 _ = __trans.ugettext
 
 import pisi
-from piksemel import *
+import piksemel as iks
 
-class XmlError(pisi.Error):
-    "named this way because the class if mostly used with an import *"
-    pass
+def getAllNodes(node, tagPath):
+    """retrieve all nodes that match a given tag path."""
+    tags = tagPath.split('/')
+    if len(tags) == 0:
+        return []
+    nodeList = [node] # basis case
+    for tag in tags:
+        results = map(lambda x: getTagByName(x, tag), nodeList)
+        nodeList = []
+        for x in results:
+            nodeList.extend(x)
+            pass # emacs indentation error, keep it here
+        if len(nodeList) == 0:
+            return []
+    return nodeList
 
 def getNodeAttribute(node, attrname):
     """get named attribute from DOM node"""
@@ -39,23 +51,22 @@ def getNodeAttribute(node, attrname):
 
 def getChildElts(node):
     """get only child elements"""
-    return [x for x in parent.childNodes if x.type() == TAG ]
+    return [x for x in parent.tags()]
 
 def getTagByName(parent, childName):
-    return [x for x in parent if x.type() == TAG and x.name() == childName]
+    return [x for x in parent.tags(childName)]
 
 def getNodeText(node, tagpath = ""):
     """get the first child and expect it to be text!"""
     if tagpath!="":
         node = getNode(node, tagpath)
-    try:
-        child = node.firstChild()
-    except IndexError:
+        if not node:
+            return None
+    child = node.firstChild()
+    if not child:
         return None
-    except AttributeError: # no node by that name
-        return None
-    if child.type() == CDATA: #FIXME: ??? TEXT type?
-        # in any case, strip whitespaces... :/ you don't like it?
+    if child.type() == iks.DATA:
+        # in any case, strip whitespaces...
         return child.data().strip()
     else:
         raise XmlError(_("getNodeText: Expected text node, got something else!"))
@@ -87,28 +98,15 @@ def getNode(node, tagpath):
             node = currentNode
     return currentNode
 
-def getAllNodes(node, tagPath):
-    """retrieve all nodes that match a given tag path."""
-
-    #FIXME: better tag split
-    tags = tagPath.split('/')
-
-    if len(tags) == 0:
-        return []
-
-    nodeList = [node] # basis case
-
-    for tag in tags:
-        results = map(lambda x: getTagByName(x, tag), nodeList)
-        nodeList = []
-        for x in results:
-            nodeList.extend(x)
-            pass # emacs indentation error, keep it here
-
-        if len(nodeList) == 0:
-            return []
-
-    return nodeList
+def addText(node, tagpath, text):
+    if tagpath != "":
+        tags = tagpath.split("/")
+        for tag in tags:
+            if node.getTag(tag):
+                node = node.getTag(tag)
+            else:
+                node = node.appendTag(tag)
+    node.appendData(text)
 
 def createTagPath(node, tags):
     """create new child at the end of a tag chain starting from node
@@ -123,8 +121,8 @@ def addTagPath(node, tags, newnode=None):
     """add newnode at the end of a tag chain, smart one"""
     node = createTagPath(node, tags)
     if newnode:                     # node to add specified
-        node.appendTag(newnode)
-    return node    
+        node.appendChild(newnode)
+    return node
 
 def addNode(node, tagpath, newnode = None, branch=True):
     """add a new node at the end of the tree and returns it
@@ -160,16 +158,3 @@ def addNode(node, tagpath, newnode = None, branch=True):
         return addTagPath(node, tags, newnode)
 
     return node
-
-def addText(node, tagPath, text, branch = True):
-    node = addNode(node, tagPath, branch = branch)
-    return node.appendData(text)
-
-    
-# cannot be implemented with piksemel
-#def newNode(node, tag):
-#    return Node(tag)
-
-# cannot be implemented with piksemel :(
-#def newTextNode(node, text):
-#    return Node(text)
diff --git a/pisi/pxml/xmlfilepiks.py b/pisi/pxml/xmlfilepiks.py
index b22ee413..0d43d8c1 100644
--- a/pisi/pxml/xmlfilepiks.py
+++ b/pisi/pxml/xmlfilepiks.py
@@ -9,26 +9,32 @@
 #
 # Please read the COPYING file.
 #
-# Authors:  Eray Ozkural <eray@pardus.org.tr>
-#           Gurer Ozen <gurer@pardus.org.tr>
-#           Baris Metin <baris@pardus.org.tr
 
 """
  XmlFile class further abstracts a dom object using the
- high-level dom functions provided in xmlext module
+ high-level dom functions provided in xmlext module (and sorely lacking
+ in xml.dom :( )
 
- this implementation uses piksemel, a fast C-based XML library
+ function names are mixedCase for compatibility with minidom,
+ an 'old library'
+
+ this implementation uses piksemel
 """
 
 import gettext
 __trans = gettext.translation('pisi', fallback=True)
 _ = __trans.ugettext
 
+import codecs
+import exceptions
+
+import piksemel as iks
+
 import pisi
-from piksemel import *
+from pisi.file import File
+from pisi.util import join_path as join
 
 class Error(pisi.Error):
-    "named this way because the class if mostly used with an import *"
     pass
 
 class XmlFile(object):
@@ -39,102 +45,26 @@ class XmlFile(object):
 
     def newDocument(self):
         """clear DOM"""
-        self.doc = newDocument(self.rootTag)
+        self.doc = iks.newDocument(self.rootTag)
 
     def unlink(self):
         """deallocate DOM structure"""
-        pass # piksemel is garbage collected!
+        pass # piksemel isnt as lame as minidom
 
     def rootNode(self):
         """returns root document element"""
         return self.doc
 
-    def readxml(self, fileName):
+    def readxml(self, uri, tmpDir='/tmp', sha1sum=False, compress=None, sign=None):
+        uri = File.make_uri(uri)
+        localpath = File.download(uri, tmpDir,sha1sum=sha1sum,compress=compress,sign=sign)
         try:
-            self.doc = parse(fileName)
-        except ParseError, inst:
-            raise XmlError(_("File '%s' has invalid XML: %s\n") % (fileName,
-                                                                   str(inst)))
+            self.doc = iks.parse(localpath)
+            return self.doc
+        except Exception, e:
+            raise Error(_("File '%s' has invalid XML") % (localpath) )
 
-    def writexml(self, fileName):
-        f = codecs.open(fileName,'w', "utf-8")
+    def writexml(self, uri, tmpDir = '/tmp', sha1sum=False, compress=None, sign=None):
+        f = File(uri, File.write, sha1sum=sha1sum, compress=compress, sign=sign)
         f.write(self.doc.toPrettyString())
         f.close()
-
-    def verifyRootTag(self):
-        actual_roottag = self.rootNode().tagName
-        if actual_roottag != self.rootTag:
-            raise Error(_("Root tagname %s not identical to %s as expected") %
-                        (actual_roottag, self.rootTag) )
-
-    # construction helpers
-
-    #def newNode(self, tag):
-    #    return self.dom.createElement(tag)
-
-    #def newTextNode(self, text):
-    #    return self.dom.createTextNode(text)
-
-    #def newAttribute(self, attr):
-    #    return self.dom.createAttribute(attr)
-
-    # read helpers
-
-    def getNode(self, tagPath = ""):
-        """returns the *first* matching node for given tag path."""
-        self.verifyRootTag()
-        return getNode(self.doc, tagPath)
-
-    def getNodeText(self, tagPath):
-        """returns the text of *first* matching node for given tag path."""
-        node = self.getNode(tagPath)
-        if not node:
-            return None
-        return getNodeText(node)
-
-    def getAllNodes(self, tagPath):
-        """returns all nodes matching a given tag path."""
-        self.verifyRootTag()
-        return getAllNodes(self.doc, tagPath)
-
-    def getChildren(self, tagpath):
-        """ returns the children of the given path"""
-        node = self.getNode(tagpath)
-        return [x for x in parent.childNodes]
-
-    # get only child elements
-    def getChildElts(self, tagpath):
-        """ returns the children of the given path, only with given type """
-        return getChildElts(self.getNode(tagpath))
-
-    # write helpers
-
-    def addNode(self, tagPath, newnode = None):
-        "this adds the newnode under given tag path"
-        self.verifyRootTag()
-        return addNode(self.doc, tagPath, newnode)
-
-    def addNodeUnder(self, node, tagPath, newnode = None):
-        "this adds the new stuff under node and then following tag path"
-        self.verifyRootTag()
-        return addNode(node, tagPath, newnode)
-
-    def addChild(self, newnode):
-        "add a new child node right under root element document"
-        self.dom.documentElement.appendChild(newnode)
-
-    def addText(self, node, text):
-        "add text to node"
-        raise Error('NOT IMPLEMENTED')
-        #node.appendChild(self.newTextNode(text))
-
-    def addTextNode(self, tagPath, text):
-        "add a text node with given tag path"
-        raise Error('NOT IMPLEMENTED')
-        #node = self.addNode(tagPath, self.newTextNode(text))
-        #return node
-
-    def addTextNodeUnder(self, node, tagPath, text):
-        "add a text node under given node with tag path (phew)"
-        raise Error('NOT IMPLEMENTED')
-        #return self.addNodeUnder(node, tagPath, self.newTextNode(text))