Changeset 454:73e3273c7624 in documentViewer for documentViewer.py

Timestamp:

Jul 15, 2011, 9:02:26 AM (13 years ago)

Author:

casties

Branch:

elementtree

Message:

more work

File:

• documentViewer.py (modified) (6 diffs)

documentViewer.py

@@ -500 +500 @@
         
         for x in range(cut):
-               
-                path=getParentDir(path)
+            path=getParentDir(path)
        
         infoUrl=self.digilibBaseUrl+"/dirInfo-xml.jsp?mo=dir&fn="+path
@@ -631 +630 @@
         logging.debug("documentViewer (getbibinfofromindexmeta cutted) path: %s"%(path))
         # put in all raw bib fields as dict "bib"
-        bib = dom.find(".//bib/*")
+        bib = dom.find(".//bib")
         #bib = dom.xpath("//bib/*")
-        if bib and len(bib)>0:
+        if bib is not None:
             bibinfo = {}
             for e in bib:
-                bibinfo[e.localName] = getTextFromNode(e)
+                bibinfo[e.tag] = getText(e)
+                
             docinfo['bib'] = bibinfo
         
         # extract some fields (author, title, year) according to their mapping
         metaData=self.metadata.main.meta.bib
-        bib = dom.find(".//bib")
         bibtype=bib.get("type")
         #bibtype=dom.xpath("//bib/@type")
@@ -712 +711 @@
         return docinfo
     
-     
+    
+    # TODO: is this needed?
     def getNameFromIndexMeta(self,path,docinfo=None,dom=None,cut=0):
         """gets name info from the index.meta file at path or given by dom"""
@@ -740 +740 @@
         archiveName = None
     
-        archiveName = getTextFromNode(dom.find("name"))
+        archiveName = getText(dom.find("name"))
         if not archiveName:
             logging.warning("documentViewer (getdocinfofromtexttool) resource/name missing in: %s" % (url))
         
-        archivePath = getTextFromNode(dom.find("archive-path"))
+        archivePath = getText(dom.find("archive-path"))
         if archivePath:
             # clean up archive path
@@ -808 +808 @@
         presentationUrl = getText(dom.find(".//texttool/presentation"))
         docinfo = self.getBibinfoFromIndexMeta(url, docinfo=docinfo, dom=dom)   # get info von bib tag
+        # TODO: is this needed here?
         docinfo = self.getNameFromIndexMeta(url, docinfo=docinfo, dom=dom)
         
@@ -831 +832 @@
         """
         dom=self.getPresentationInfoXML(url)
-        try:
-            docinfo['author']=getText(dom.find(".//author"))
-        except:
-            pass
-        try:
-            docinfo['title']=getText(dom.find(".//title"))
-        except:
-            pass
-        try:
-            docinfo['year']=getText(dom.find(".//date"))
-        except:
-            pass
+        docinfo['author']=getText(dom.find(".//author"))
+        docinfo['title']=getText(dom.find(".//title"))
+        docinfo['year']=getText(dom.find(".//date"))
         return docinfo