Changeset 75:9673218e155b in documentViewer

Timestamp:

Nov 4, 2008, 10:03:56 PM (17 years ago)

Author:

dwinter

Branch:

default

Message:

minorCVS: ----------------------------------------------------------------------

File:

• documentViewer.py (modified) (5 diffs)

documentViewer.py

@@ -22 +22 @@
 
 import urlparse 
-
+from types import *
 def logger(txt,method,txt2):
     """logging"""
@@ -168 +168 @@
                 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
     
@@ -294 +299 @@
             if not metaUrl.endswith("index.meta"):
                 metaUrl += "/index.meta"
-        print metaUrl
+        logging.debug("METAURL: %s"%metaUrl)
         for cnt in range(num_retries):
             try:
@@ -553 +558 @@
             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!")
@@ -584 +589 @@
             if np % grpsize > 0:
                 pageinfo['numgroups'] += 1
-                
+        logging.debug("getPageInfo: %s"%repr(pageinfo))
         return pageinfo