--- documentViewer/documentViewer.py	2008/11/04 20:36:50	1.36
+++ 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)
@@ -167,12 +167,17 @@ class documentViewer(Folder):
             else:
                 viewMode="images"
                
-        return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode,marks=self.generateMarks(mk))
+        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"%mk
+            ret+="mk=%s"%m
         return ret
     
     def getLink(self,param=None,val=None):
@@ -184,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()])
@@ -252,7 +260,9 @@ class documentViewer(Folder):
             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))
@@ -293,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
@@ -349,7 +359,7 @@ class documentViewer(Folder):
             docinfo = {}
             
         if dom is None:
-            for x in range(cut+1):
+            for x in range(cut):
                 path=getParentDir(path)
             dom = self.getIndexMeta(path)
        
@@ -369,9 +379,9 @@ class documentViewer(Folder):
         
         if docinfo is None:
             docinfo = {}
-            
+        
         if dom is None:
-            for x in range(cut+1):
+            for x in range(cut):
                 path=getParentDir(path)
             dom = self.getIndexMeta(path)
             
@@ -470,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")
@@ -527,6 +538,10 @@ class documentViewer(Folder):
         path=path.replace("/mpiwg/online","")
         docinfo['imagePath'] = path
         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
         
@@ -552,7 +567,7 @@ class documentViewer(Folder):
         elif mode=="imagepath":
             docinfo = self.getDocinfoFromImagePath(url, docinfo=docinfo)
         elif mode=="filepath":
-            docinfo = self.getDocinfoFromImagePath(url, docinfo=docinfo,cut=2)
+            docinfo = self.getDocinfoFromImagePath(url, docinfo=docinfo,cut=1)
         else:
             logger("documentViewer (getdocinfo)", logging.ERROR,"unknown mode!")
             raise ValueError("Unknown mode %s"%(mode))
@@ -583,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):