Changeset 869

Timestamp:

05/22/07 08:42:30

Author:

mylan

Message:

Fix batching bugs

Files:

• SimpleBlog/branches/optimizations/content/blog.py (modified) (5 diffs)

SimpleBlog/branches/optimizations/content/blog.py

@@ -260 +260 @@
-        return [f for f in self.getBRefs('AppearsIn') if self.portal_membership.checkPermission('View', f)]
-
-
+, query, notlimited_len
-        """Return batch for navigation"""
-
+
+
+
+
+
+
+
+
+
-        ditems = self.getDisplayItems()
-len/ditems
+total_len/ditems + (total_len%ditems and 1 or 0)
-        batch = []
-        if max_pages:
@@ -296 +304 @@
-        except:
-            b_start = 0
-
-
-
-
-
+
-            b_start = 0
-        else:
-            b_start = (b_start % ditems)!=0 and (b_start/ditems)*ditems or b_start
-        return b_start
-
@@ -328 +330 @@
-
-        onBottom = list(self.portal_catalog.searchResults(query))
-        batch = 'navigation' in query.keys() and self.buildBatch(b_start) or []
-        ####  cut the b_start when it is tooo large
-
-        itemsPerPage = self.getDisplayItems()
-        last = 0
@@ -341 +341 @@
-        if join:
-            results = onTop+onBottom
+            batch = 'navigation' in query.keys() and self.buildBatch(b_start, query, len(results)) or []
-            if b_start > 0:
-                if len(onBottom) == b_start:
@@ -348 +349 @@
-            return (results,last,batch)
-        else:
+            batch = 'navigation' in query.keys() and self.buildBatch(b_start, query, len(onBottom)) or []
-            return (onTop, onBottom, batch)
-