Changeset 613:c57d80a649ea in documentViewer for documentViewer.py

Timestamp:

Oct 17, 2013, 2:25:39 PM (11 years ago)

Author:

casties

Branch:

default

Message:

CLOSED - # 281: List of thumbnails verschluckt Seite, wenn odd-scan-position gesetzt ist
​https://it-dev.mpiwg-berlin.mpg.de/tracs/mpdl-project-software/ticket/281

File:

• documentViewer.py (modified) (7 diffs)

documentViewer.py

@@ -5 +5 @@
 from AccessControl import ClassSecurityInfo
 from AccessControl import getSecurityManager
-from Globals import package_home
 
 import xml.etree.ElementTree as ET
 
 import os
-import sys
 import urllib
 import logging
 import math
 import urlparse 
-import re
-import string
 import json
 
@@ -23 +19 @@
 from SrvTxtUtils import getInt, utf8ify, getText, getHttpData, refreshingImageFileIndexHtml
     
-def serializeNode(node, encoding="utf-8"):
-    """returns a string containing node as XML"""
-    s = ET.tostring(node)
-    
-    # 4Suite:
-    #    stream = cStringIO.StringIO()
-    #    Ft.Xml.Domlette.Print(node, stream=stream, encoding=encoding)
-    #    s = stream.getvalue()
-    #    stream.close()
-    return s
 
 def getMDText(node):
@@ -994 +980 @@
 
     def getPageBatch(self, start=1, rows=10, cols=2, pageFlowLtr=True, pageZero=False, minIdx=1, maxIdx=0):
-        """returns dict with array of page information for one screenfull of thumbnails"""
+        """Return dict with array of page information for one screenfull of thumbnails.
+
+        :param start: index of current page
+        :param rows: number of rows in one batch
+        :param cols: number of columns in one batch
+        :param pageFlowLtr: do indexes increase from left to right
+        :param pageZero: is there a zeroth non-visible page
+        :param minIdx: minimum index to use
+        :param maxIdx: maximum index to use
+        :returns: dict with
+            first: first page index
+            last: last page index
+            batches: list of all possible batches(dict: 'start': index, 'end': index)
+            pages: list for current batch of rows(list of cols(list of pages(dict: 'idx': index)))
+            nextStart: first index of next batch
+            prevStart: first index of previous batch 
+        """
         logging.debug("getPageBatch start=%s minIdx=%s maxIdx=%s"%(start,minIdx,maxIdx))
         batch = {}
@@ -1002 +1004 @@
 
         np = maxIdx - minIdx + 1
+        if pageZero:
+            # correct number of pages for batching
+            np += 1
+            
         nb = int(math.ceil(np / float(grpsize)))
+        
         # list of all batch start and end points
         batches = []
@@ -1017 +1024 @@
         batch['batches'] = batches
 
+        # list of pages for current screen
         pages = []
         if pageZero and start == minIdx:
@@ -1046 +1054 @@
             
         if start + grpsize <= maxIdx:
-            batch['nextStart'] = start + grpsize
+            if pageZero and start == minIdx:
+                # correct nextStart for pageZero
+                batch['nextStart'] = grpsize
+            else:
+                batch['nextStart'] = start + grpsize
         else:
             batch['nextStart'] = None
@@ -1053 +1065 @@
         batch['first'] = minIdx
         batch['last'] = maxIdx
+        logging.debug("batch: %s"%repr(batch))
         return batch
+        
         
     def getBatch(self, start=1, size=10, end=0, data=None, fullData=True):