--- documentViewer/documentViewer.py	2006/04/10 10:13:01	1.5
+++ documentViewer/documentViewer.py	2006/04/10 11:23:18	1.6
@@ -43,23 +43,6 @@ def urlopen(url):
         socket.setdefaulttimeout(5)
         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])
-
     
 
 
@@ -111,7 +94,6 @@ class documentViewer(Folder):
         '''
         
         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'):
             # create template folder if it doesn't exist
@@ -149,6 +131,24 @@ class documentViewer(Folder):
             return style    
         
         
+    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"""
         zLOG.LOG("documentViewer (getbibinfofromindexmeta)", zLOG.INFO,"path: %s"%(path))
@@ -210,7 +210,7 @@ class documentViewer(Folder):
        if image and archivePath:
            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
            
@@ -235,11 +235,11 @@ class documentViewer(Folder):
         zLOG.LOG("documentViewer (getdocinfofromimagepath)", zLOG.INFO,"path: %s"%(path))
         if docinfo is None:
             docinfo = {}
-        docinfo['imagePath'] = path
         path=path.replace("/mpiwg/online","")
-        pt=getParamFromDigilib(path,'size')
+        docinfo['imagePath'] = path
+        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
         
         docinfo = self.getBibinfoFromIndexMeta(path,docinfo=docinfo)