--- documentViewer/documentViewer.py	2008/06/25 10:47:58	1.32
+++ documentViewer/documentViewer.py	2009/03/06 15:36:38	1.38
@@ -21,7 +21,7 @@ import logging
 import math
 
 import urlparse 
-
+from types import *
 def logger(txt,method,txt2):
     """logging"""
     logging.info(txt+ txt2)
@@ -139,7 +139,7 @@ class documentViewer(Folder):
         return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode)
   
     security.declareProtected('View','index_html')
-    def index_html(self,mode,url,viewMode="auto",start=None,pn=1):
+    def index_html(self,mode,url,viewMode="auto",start=None,pn=1,mk=None):
         '''
         view it
         @param mode: defines how to access the document behind url 
@@ -167,9 +167,19 @@ class documentViewer(Folder):
             else:
                 viewMode="images"
                
-        return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode)
-  
+        return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode,mk=self.generateMarks(mk))
   
+    def generateMarks(self,mk):
+        ret=""
+	if mk is None:
+		return ""
+	
+	if type(mk) is not ListType:
+		mk=[mk]
+        for m in mk:
+            ret+="mk=%s"%m
+        return ret
+    
     def getLink(self,param=None,val=None):
         """link to documentviewer with parameter param set to val"""
         params=self.REQUEST.form.copy()
@@ -179,6 +189,9 @@ class documentViewer(Folder):
                     del params[param]
             else:
                 params[param] = str(val)
+        if params["mode"] == "filepath": #wenn beim erst Aufruf filepath gesetzt wurde aendere das nun zu imagepath
+                params["mode"] = "imagepath"
+                params["url"] = getParentDir(params["url"])
                 
         # quote values and assemble into query string
         ps = "&".join(["%s=%s"%(k,urllib.quote(v)) for (k, v) in params.items()])
@@ -240,12 +253,16 @@ class documentViewer(Folder):
         return False
     
                 
-    def getDirinfoFromDigilib(self,path,docinfo=None):
+    def getDirinfoFromDigilib(self,path,docinfo=None,cut=0):
         """gibt param von dlInfo aus"""
         num_retries = 3
         if docinfo is None:
             docinfo = {}
-            
+        
+        for x in range(cut):
+               
+                path=getParentDir(path)
+       
         infoUrl=self.digilibBaseUrl+"/dirInfo-xml.jsp?mo=dir&fn="+path
     
         logger("documentViewer (getparamfromdigilib)", logging.INFO, "dirInfo from %s"%(infoUrl))
@@ -286,7 +303,7 @@ class documentViewer(Folder):
             metaUrl=server+url.replace("/mpiwg/online","")
             if not metaUrl.endswith("index.meta"):
                 metaUrl += "/index.meta"
-        print metaUrl
+        logging.debug("METAURL: %s"%metaUrl)
         for cnt in range(num_retries):
             try:
                 # patch dirk encoding fehler treten dann nicht mehr auf
@@ -332,7 +349,7 @@ class documentViewer(Folder):
         return dom
                         
         
-    def getAuthinfoFromIndexMeta(self,path,docinfo=None,dom=None):
+    def getAuthinfoFromIndexMeta(self,path,docinfo=None,dom=None,cut=0):
         """gets authorization info from the index.meta file at path or given by dom"""
         logger("documentViewer (getauthinfofromindexmeta)", logging.INFO,"path: %s"%(path))
         
@@ -342,7 +359,9 @@ class documentViewer(Folder):
             docinfo = {}
             
         if dom is None:
-            dom = self.getIndexMeta(getParentDir(path))
+            for x in range(cut):
+                path=getParentDir(path)
+            dom = self.getIndexMeta(path)
        
         acctype = dom.xpath("//access-conditions/access/@type")
         if acctype and (len(acctype)>0):
@@ -354,15 +373,17 @@ class documentViewer(Folder):
         return docinfo
     
         
-    def getBibinfoFromIndexMeta(self,path,docinfo=None,dom=None):
+    def getBibinfoFromIndexMeta(self,path,docinfo=None,dom=None,cut=0):
         """gets bibliographical info from the index.meta file at path or given by dom"""
         logging.debug("documentViewer (getbibinfofromindexmeta) path: %s"%(path))
         
         if docinfo is None:
             docinfo = {}
-            
+        
         if dom is None:
-            dom = self.getIndexMeta(getParentDir(path))
+            for x in range(cut):
+                path=getParentDir(path)
+            dom = self.getIndexMeta(path)
             
         # put in all raw bib fields as dict "bib"
         bib = dom.xpath("//bib/*")
@@ -459,6 +480,7 @@ class documentViewer(Folder):
            imageDir=imageDir.replace("/mpiwg/online",'')
            docinfo=self.getDirinfoFromDigilib(imageDir,docinfo=docinfo)
            docinfo['imagePath'] = imageDir
+           
            docinfo['imageURL'] = self.digilibBaseUrl+"/servlet/Scaler?fn="+imageDir
            
        viewerUrls=dom.xpath("//texttool/digiliburlprefix")
@@ -508,19 +530,23 @@ class documentViewer(Folder):
             pass
         return docinfo
     
-    def getDocinfoFromImagePath(self,path,docinfo=None):
+    def getDocinfoFromImagePath(self,path,docinfo=None,cut=0):
         """path ist the path to the images it assumes that the index.meta file is one level higher."""
         logger("documentViewer (getdocinfofromimagepath)", logging.INFO,"path: %s"%(path))
         if docinfo is None:
             docinfo = {}
         path=path.replace("/mpiwg/online","")
         docinfo['imagePath'] = path
-        docinfo=self.getDirinfoFromDigilib(path,docinfo=docinfo)
+        docinfo=self.getDirinfoFromDigilib(path,docinfo=docinfo,cut=cut)
+        
+        for x in range(cut):       
+                path=getParentDir(path)
+        logging.error("PATH:"+path)
         imageUrl=self.digilibBaseUrl+"/servlet/Scaler?fn="+path
         docinfo['imageURL'] = imageUrl
         
-        docinfo = self.getBibinfoFromIndexMeta(path,docinfo=docinfo)
-        docinfo = self.getAuthinfoFromIndexMeta(path,docinfo=docinfo)
+        docinfo = self.getBibinfoFromIndexMeta(path,docinfo=docinfo,cut=cut)
+        docinfo = self.getAuthinfoFromIndexMeta(path,docinfo=docinfo,cut=cut)
         return docinfo
     
     
@@ -540,6 +566,8 @@ class documentViewer(Folder):
             docinfo = self.getDocinfoFromTextTool(url, docinfo=docinfo)
         elif mode=="imagepath":
             docinfo = self.getDocinfoFromImagePath(url, docinfo=docinfo)
+        elif mode=="filepath":
+            docinfo = self.getDocinfoFromImagePath(url, docinfo=docinfo,cut=1)
         else:
             logger("documentViewer (getdocinfo)", logging.ERROR,"unknown mode!")
             raise ValueError("Unknown mode %s"%(mode))
@@ -570,7 +598,7 @@ class documentViewer(Folder):
             pageinfo['numgroups'] = int(np / grpsize)
             if np % grpsize > 0:
                 pageinfo['numgroups'] += 1
-                
+
         return pageinfo
                 
     def text(self,mode,url,pn):