Changeset 29:e1bed068b351 in documentViewer

Timestamp:

Apr 10, 2006, 11:23:18 AM (18 years ago)

Author:

casties

Branch:

default

Message:

small fixes

File:

• documentViewer.py (modified) (5 diffs)

documentViewer.py

@@ -44 +44 @@
         return ret
     
-def getParamFromDigilib(path,param):
-    """gibt param von dlInfo aus"""
-    imageUrl=genericDigilib+"/dirInfo-xml.jsp?mo=dir&fn="+path
-
-    zLOG.LOG("documentViewer (getparamfromdigilib)", zLOG.INFO, "dirInfo (%s) from %s"%(param,imageUrl))
-    
-    try:
-        dom = NonvalidatingReader.parseUri(imageUrl)
-    except:
-        return None
-    
-    params=dom.xpath("//dir/%s"%param)
-    zLOG.LOG("documentViewer (getparamfromdigilib)", zLOG.INFO, "dirInfo:%s"%params)
-    
-    if params:
-        return getTextFromNode(params[0])
-
     
 
@@ -112 +95 @@
         
         zLOG.LOG("documentViewer (index)", zLOG.INFO, "mode: %s url:%s start:%s pn:%s"%(mode,url,start,pn))
-        print "dlbaseurl:", self.digilibBaseUrl
         
         if not hasattr(self, 'template'):
@@ -150 +132 @@
         
         
+    def getParamFromDigilib(self,path,param):
+        """gibt param von dlInfo aus"""
+        imageUrl=self.digilibBaseUrl+"/dirInfo-xml.jsp?mo=dir&fn="+path
+    
+        zLOG.LOG("documentViewer (getparamfromdigilib)", zLOG.INFO, "dirInfo (%s) from %s"%(param,imageUrl))
+        
+        try:
+            dom = NonvalidatingReader.parseUri(imageUrl)
+        except:
+            return None
+        
+        params=dom.xpath("//dir/%s"%param)
+        zLOG.LOG("documentViewer (getparamfromdigilib)", zLOG.INFO, "dirInfo:%s"%params)
+        
+        if params:
+            return getTextFromNode(params[0])
+            
+    
     def getBibinfoFromIndexMeta(self,path,docinfo=None,dom=None):
         """gets bibliographical info from the index.meta file at url or given by dom"""
@@ -211 +211 @@
            image=os.path.join(archivePath,image)
            image=image.replace("/mpiwg/online",'')
-           pt=getParamFromDigilib(image,'size')
+           pt=self.getParamFromDigilib(image,'size')
            docinfo['imagePath'] = image
            docinfo['numPages'] = pt
@@ -236 +236 @@
         if docinfo is None:
             docinfo = {}
+        path=path.replace("/mpiwg/online","")
         docinfo['imagePath'] = path
-        path=path.replace("/mpiwg/online","")
-        pt=getParamFromDigilib(path,'size')
+        pt=self.getParamFromDigilib(path,'size')
         docinfo['numPages'] = pt
-        imageUrl=genericDigilib+"/servlet/Scaler?fn=%s"%path
+        imageUrl=self.digilibBaseUrl+"/servlet/Scaler?fn=%s"%path
         docinfo['imageURL'] = imageUrl