Changeset 2404

Timestamp:

01/19/07 11:11:44 (2 years ago)

Author:

alberto

Message:

paginate.py now supports SA, improves sorting and fixes CompoundWidget? submissions. Closes #1115. Thanks Randall

Files:

• branches/1.0/turbogears/paginate.py (modified) (9 diffs)

branches/1.0/turbogears/paginate.py

@@ +1 @@
+import re
+import types
-from math import ceil
-import logging
@@ -6 +8 @@
-    from sqlobject.main import SelectResults
-except ImportError:
-
-
+
+
+
+
+
+
+
+
+
-import turbogears
-from turbogears.decorator import weak_signature_decorator
-from turbogears.view import variable_providers
+from formencode.variabledecode import variable_encode, variable_decode
-
-log = logging.getLogger("turbogears.paginate")
@@ -20 +30 @@
-            page = int(kw.pop('tg_paginate_no', 1))
-            limit_ = int(kw.pop('tg_paginate_limit', limit))
-
-
-
+
+
+
+
+
+
+
-            if not allow_limit_override:
-                limit_ = limit
-
-,
-reversed=%s", page, limit_, order, reversed
+
+
+", page, limit_, order
-            
-            # get the output from the decorated function    
@@ -41 +55 @@
-                raise "If you want to enable ordering you need " \
-                      "to provide a default_order" 
-
+
+
+
+
+
+
-            row_count = 0
-
+
+
-                row_count = var_data.count()
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    else:
-
-
-
+
-            elif isinstance(var_data, list):
-                row_count = len(var_data)
@@ -71 +99 @@
-            # which one should we use? cherrypy.request.input_values or kw?
-            #input_values = cherrypy.request.input_values.copy()
-
+
+
-            input_values.pop('self', None)
-
+
+
+
+
-            cherrypy.request.paginate = Paginate(current_page=page,
-    
-    
-    
-    
-    
-    reversed=reversed
-    
+
+
+
+
+
+ordering=ordering
+
-            # we replace the var with the sliced one
-            endpoint = offset + limit_
@@ -102 +134 @@
-    """class for variable provider"""
-    def __init__(self, current_page, pages, page_count, input_values, 
-
+
+
-        self.pages = pages
-        self.limit = limit
@@ -109 +142 @@
-        self.input_values = input_values
-        self.order = order
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if current_page < page_count:
-            self.input_values.update(dict(
@@ -141 +183 @@
-            
-    def get_href(self, page, order=None, reverse_order=None):
+        # Note that reverse_order is not used.  It should be cleaned up here
+        # and in the template.  I'm not removing it now because I don't want
+        # to break the API.
+        order = order or None
+        self.input_values['tg_paginate_no'] = page
-        if order:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-        return turbogears.url('', self.input_values)
-
-
-def _select_pages_to_show(current_page, page_count, max_pages):
@@ -190 +218 @@
-        
-    return range(start, end+1)
+
+def sort_ordering(ordering, sort_name):
+    """Rearrange ordering based on sort_name."""
+    log.debug('sort called with %s and %s' % (ordering, sort_name))
+    if sort_name not in ordering:
+        ordering[sort_name] = [-1, True] 
+    if ordering[sort_name][0] == 0:
+        # Flip
+        ordering[sort_name][1] = not ordering[sort_name][1]
+    else:
+        ordering[sort_name][0] = 0
+        for key in ordering.keys():
+            if key != sort_name and ordering[key][0] < len(ordering) - 1:
+                ordering[key][0] += 1
+    log.debug('sort results is %s and %s' % (ordering, sort_name))
+
+def sql_get_column(colname, var_data):
+    """Return a column from var_data based on colname."""
+    if isinstance(var_data, SelectResults):
+        col = getattr(var_data.sourceClass.q, colname, None)
+    elif isinstance(var_data, SASelectResults):
+        col = getattr(var_data._query.table.c, colname, None)
+    else:
+        raise StandardError, 'expected SelectResults'
+    return col
+
+def sql_order_col(col, ascending=True):
+    """Return an ordered col for col."""
+    if isinstance(col, sqlalchemy.schema.Column):
+        if ascending:
+            order_col = sqlalchemy.sql.asc(col)
+        else:
+            order_col = sqlalchemy.sql.desc(col)
+    elif isinstance(col, types.InstanceType):
+        # I don't like using InstanceType, but that's what sqlobject col type
+        # is.
+        if ascending:
+            order_col = col
+        else:
+            order_col = sqlobject.DESC(col)
+    else:
+        raise StandardError, 'expected Column, but got %s' % str(type(col))
+    return order_col
+   
+# Ordering re:
+ordering_expr = re.compile(r"('\w+'): ?\[(\d+), ?(True|False)\]")
+
+def convert_ordering(ordering):
+    """Covert ordering unicode string to dict."""
+
+    log.debug('ordering received %s' % str(ordering))
+
+    # eval would be simple, but insecure.
+    if not isinstance(ordering, (str, unicode)):
+        raise ValueError, "ordering should be string or unicode."
+    new_ordering = {}
+    if ordering == u"{}":
+        pass
+    else:
+        try:
+            ordering_info_find = ordering_expr.findall(ordering)
+            emsg = "Didn't match ordering for %s." % str(ordering)
+            assert len(ordering_info_find) > 0, emsg
+            for ordering_info in ordering_info_find:
+                ordering_key = str(ordering_info[0]).strip("'")
+                ordering_order = int(ordering_info[1])
+                ordering_reverse = bool(ordering_info[2] == 'True')
+                new_ordering[ordering_key] = [ordering_order,
+                                              ordering_reverse]
+        except StandardError, e:
+            log.debug('FAILED to convert ordering.')
+            new_ordering = {}
+    log.debug('ordering converted to %s' % str(new_ordering))
+    return new_ordering