Changeset 455:0a53fea83df7 in documentViewer for documentViewer_old.py

Timestamp:

Jul 15, 2011, 7:34:41 PM (13 years ago)

Author:

casties

Branch:

elementtree

Message:

more work renovating

File:

• documentViewer_old.py (modified) (8 diffs)

documentViewer_old.py

@@ -10 +10 @@
 from Ft.Xml import EMPTY_NAMESPACE, Parse 
 import Ft.Xml.Domlette
-
-import xml.etree.ElementTree as ET
-
 import os.path
 import sys
@@ -36 +33 @@
         return int(default)
 
-def getTextFromNode(node):
+def getTextFromNode(nodename):
     """get the cdata content of a node"""
-    if node is None:
+    if nodename is None:
         return ""
-    # ET:
-    text = node.text or ""
-    for e in node:
-        text += gettext(e)
-        if e.tail:
-            text += e.tail
-
-    # 4Suite:
-    #nodelist=node.childNodes
-    #text = ""
-    #for n in nodelist:
-    #    if n.nodeType == node.TEXT_NODE:
-    #       text = text + n.data
-    
-    return text
+    nodelist=nodename.childNodes
+    rc = ""
+    for node in nodelist:
+        if node.nodeType == node.TEXT_NODE:
+           rc = rc + node.data
+    return rc
 
 def serializeNode(node, encoding="utf-8"):
     """returns a string containing node as XML"""
-    s = ET.tostring(node)
-    
-    # 4Suite:
-    #    stream = cStringIO.StringIO()
-    #    Ft.Xml.Domlette.Print(node, stream=stream, encoding=encoding)
-    #    s = stream.getvalue()
-    #    stream.close()
+    stream = cStringIO.StringIO()
+    #logging.debug("BUF: %s"%(stream))
+    Ft.Xml.Domlette.Print(node, stream=stream, encoding=encoding)
+    s = stream.getvalue()
+    #logging.debug("BUF: %s"%(s))
+    stream.close()
     return s
 
@@ -510 +497 @@
             raise IOError("Unable to get dir-info from %s"%(infoUrl))
 
-        dom = ET.fromstring(txt).getroot()
-        #dom = Parse(txt)
-        sizes=dom.find("//dir/size")
-        #sizes=dom.xpath("//dir/size")
+        dom = Parse(txt)
+        sizes=dom.xpath("//dir/size")
         logging.debug("documentViewer (getparamfromdigilib) dirInfo:size"%sizes)
         
@@ -562 +547 @@
             raise IOError("Unable to read index meta from %s"%(url))
         
-        dom = ET.fromstring(txt).getroot()
-        #dom = Parse(txt)
+        dom = Parse(txt)
         return dom
     
@@ -582 +566 @@
             raise IOError("Unable to read infoXMLfrom %s"%(url))
             
-        dom = ET.fromstring(txt).getroot()
-        #dom = Parse(txt)
+        dom = Parse(txt)
         return dom
                         
@@ -601 +584 @@
             dom = self.getDomFromIndexMeta(path)
        
-        acctype = dom.find("//access-conditions/access/@type")
-        #acctype = dom.xpath("//access-conditions/access/@type")
+        acctype = dom.xpath("//access-conditions/access/@type")
         if acctype and (len(acctype)>0):
             access=acctype[0].value
@@ -628 +610 @@
         logging.debug("documentViewer (getbibinfofromindexmeta cutted) path: %s"%(path))
         # put in all raw bib fields as dict "bib"
-        bib = dom.find("//bib/*")
-        #bib = dom.xpath("//bib/*")
+        bib = dom.xpath("//bib/*")
         if bib and len(bib)>0:
             bibinfo = {}
@@ -638 +619 @@
         # extract some fields (author, title, year) according to their mapping
         metaData=self.metadata.main.meta.bib
-        bibtype=dom.find("//bib/@type")
-        #bibtype=dom.xpath("//bib/@type")
+        bibtype=dom.xpath("//bib/@type")
         if bibtype and (len(bibtype)>0):
             bibtype=bibtype[0].value