Changeset 37:ead830ce45d6 in documentViewer

Timestamp:

Apr 12, 2006, 6:53:00 PM (18 years ago)

Author:

casties

Branch:

default

Tags:

Root_roc_1

Message:

better error messages

File:

• documentViewer.py (modified) (6 diffs)

documentViewer.py

@@ -178 +178 @@
                 zLOG.LOG("documentViewer (getdirinfofromdigilib)", zLOG.ERROR, "error reading %s (try %d)"%(imageUrl,cnt))
         else:
-            raise IOError("Unable to get dirinfo from %s"%(imageUrl))
-        
-        params=dom.xpath("//dir/size")
-        zLOG.LOG("documentViewer (getparamfromdigilib)", zLOG.INFO, "dirInfo:size"%params)
-        
-        if params:
-            docinfo['numPages'] = int(getTextFromNode(params[0]))
+            raise IOError("Unable to get dir-info from %s"%(imageUrl))
+        
+        sizes=dom.xpath("//dir/size")
+        zLOG.LOG("documentViewer (getparamfromdigilib)", zLOG.INFO, "dirInfo:size"%sizes)
+        
+        if sizes:
+            docinfo['numPages'] = int(getTextFromNode(sizes[0]))
         else:
             docinfo['numPages'] = 0
@@ -200 +200 @@
             except:
                 zLOG.LOG("documentViewer (getIndexMata)", zLOG.INFO,"%s (%s)"%sys.exc_info()[0:2])
-                raise IOError("Unable to get info from %s"%(url))
+                raise IOError("Unable to read index.meta from %s"%(url))
         else:
             # online path
@@ -211 +211 @@
             except:
                 zLOG.LOG("documentViewer (getIndexMata)", zLOG.INFO,"%s (%s)"%sys.exc_info()[0:2])
-                raise IOError("Unable to get info from %s"%(url))
+                raise IOError("Unable to read index meta from %s"%(url))
                  
         return dom
@@ -218 +218 @@
     def getAuthinfoFromIndexMeta(self,path,docinfo=None,dom=None):
         """gets authorization info from the index.meta file at path or given by dom"""
-        zLOG.LOG("documentViewer (getbibinfofromindexmeta)", zLOG.INFO,"path: %s"%(path))
+        zLOG.LOG("documentViewer (getauthinfofromindexmeta)", zLOG.INFO,"path: %s"%(path))
         
         access = None
@@ -294 +294 @@
            imageDir=getTextFromNode(imageDirs[0])
        else:
-           imageDir=None
+           # we balk with no image tag
+           raise IOError("No text-tool info in %s"%(url))
            
        if imageDir and archivePath:
@@ -353 +354 @@
         else:
             zLOG.LOG("documentViewer (getdocinfo)", zLOG.ERROR,"unknown mode!")
+            raise ValueError("Unknown mode %s"%(mode))
+                        
         zLOG.LOG("documentViewer (getdocinfo)", zLOG.INFO,"docinfo: %s"%docinfo)
         self.REQUEST.SESSION['docinfo'] = docinfo