Changeset 43:f3bc59cf64d9 in documentViewer

Timestamp:

Jul 18, 2006, 4:59:57 PM (19 years ago)

Author:

casties

Branch:

default

Message:

fixed some problems with bad index.meta files (text-tools mode)

Files:

• documentViewer.py (modified) (2 diffs)
• version.txt (modified) (1 diff)

documentViewer.py

@@ -285 +285 @@
            dom = self.getIndexMeta(url)
        
+       archivePath = None
+       archiveName = None
+
        archiveNames=dom.xpath("//resource/name")
        if archiveNames and (len(archiveNames)>0):
            archiveName=getTextFromNode(archiveNames[0])
+       else:
+           zLOG.LOG("documentViewer (getdocinfofromtexttool)", zLOG.WARNING,"resource/name missing in: %s"%(url))
        
        archivePaths=dom.xpath("//resource/archive-path")
@@ -295 +300 @@
            if archivePath[0] != '/':
                archivePath = '/' + archivePath
-           if not archivePath.endswith(archiveName):
+           if archiveName and (not archivePath.endswith(archiveName)):
                archivePath += "/" + archiveName
        else:
-           archivePath=None
+           # try to get archive-path from url
+           zLOG.LOG("documentViewer (getdocinfofromtexttool)", zLOG.WARNING,"resource/archive-path missing in: %s"%(url))
+           if (not url.startswith('http')):
+               archivePath = url.replace('index.meta', '')
+               
+       if archivePath is None:
+           # we balk without archive-path
+           raise IOError("Missing archive-path (for text-tool) in %s"%(url))
        
        imageDirs=dom.xpath("//texttool/image")

version.txt

@@ -1 @@
-DocumentViewer 0.2.6
+DocumentViewer 0.3.1