Hack hack...

. Lots of cleanup in the classic html (stylesheet, search page, index page, ...)
. Reinstated searching, but not query saving yet
. Filtering only allows sorting and grouping by one property - all backends
  now implement this behaviour.
. Nosy list journalling turned off by default, everything else is on.
. Added some convenience methods (reverse, propchanged, [item] accesses, ...)
. Did I mention the stylesheet is much cleaner now? :)

Author: Richard Jones

TODO.txt

@@ -14,7 +14,6 @@ pending hyperdb: range searching of values (dates in particular)
           [value, value, ...] implies "in"
 pending hyperdb: make creator, creation and activity available pre-commit
 pending hyperdb: migrate "id" property to be Number type
-pending hyperdb: allow classes to define their ordering (properties, asc/desc)
 pending instance: including much simpler upgrade path and the use of
                   non-Python configuration files (ConfigParser)
 pending instance: split instance.open() into open() and login()
@@ -34,25 +33,27 @@ pending project: have the demo allow anonymous login
 pending security: at least an LDAP user database implementation
 pending security: authenticate over a secure connection
 pending security: use digital signatures in mailgw
+pending security: submission protection
 pending web: I18N
 pending web: Better message summary display (feature request #520244)
 pending web: Navigating around the issues (feature request #559149)
-pending web: Re-enable link backrefs from messages (feature request #568714)
 pending web: Quick help links next to the property labels giving a
              description of the property. Combine with help for the actual
              form element too, eg. how to use the nosy list edit box.
 pending web: clicking on a group header should filter for that type of entry
 pending web: re-enable auth by basic http auth
 
-New templating TODO
+New templating TODO:
+. generic class editing
 . classhelp
 . query saving
-. search page is a shambles
-. view customisation is a shambles
-. style is a shambles
+. search "refinement" (pre-fill the search page with the current search
+  parameters)
+. security on actions (only allows/enforces generic Edit perm on the class :()
 
 ongoing: any bugs
 
+done web: Re-enable link backrefs from messages (feature request #568714) (RJ)
 done web: have the page layout (header/footer) be templatable (RJ)
 done web: fixing the templating so it works (RJ)
 done web: re-work cgi interface to abstract out the explicit "issue"

roundup/backends/back_anydbm.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-#$Id: back_anydbm.py,v 1.65 2002-08-30 08:35:45 richard Exp $
+#$Id: back_anydbm.py,v 1.66 2002-09-01 04:32:30 richard Exp $
 '''
 This module defines a backend that saves the hyperdatabase in a database
 chosen by anydbm. It is guaranteed to always be available in python
@@ -1471,8 +1471,8 @@ def filter(self, search_matches, filterspec, sort, group,
             sort spec.
 
             "filterspec" is {propname: value(s)}
-            "sort" is ['+propname', '-propname', 'propname', ...]
-            "group is ['+propname', '-propname', 'propname', ...]
+            "sort" and "group" are (dir, prop) where dir is '+', '-' or None
+                               and prop is a prop name or None
             "search_matches" is {nodeid: marker}
         '''
         cn = self.classname
@@ -1591,126 +1591,109 @@ def filter(self, search_matches, filterspec, sort, group,
                     k.append(v)
             l = k
 
-        # optimise sort
-        m = []
-        for entry in sort:
-            if entry[0] != '-':
-                m.append(('+', entry))
-            else:
-                m.append((entry[0], entry[1:]))
-        sort = m
-
-        # optimise group
-        m = []
-        for entry in group:
-            if entry[0] != '-':
-                m.append(('+', entry))
-            else:
-                m.append((entry[0], entry[1:]))
-        group = m
         # now, sort the result
         def sortfun(a, b, sort=sort, group=group, properties=self.getprops(),
                 db = self.db, cl=self):
             a_id, an = a
             b_id, bn = b
             # sort by group and then sort
-            for list in group, sort:
-                for dir, prop in list:
-                    # sorting is class-specific
-                    propclass = properties[prop]
+            for dir, prop in group, sort:
+                if dir is None: continue
 
-                    # handle the properties that might be "faked"
-                    # also, handle possible missing properties
-                    try:
-                        if not an.has_key(prop):
-                            an[prop] = cl.get(a_id, prop)
-                        av = an[prop]
-                    except KeyError:
-                        # the node doesn't have a value for this property
-                        if isinstance(propclass, Multilink): av = []
-                        else: av = ''
+                # sorting is class-specific
+                propclass = properties[prop]
+
+                # handle the properties that might be "faked"
+                # also, handle possible missing properties
+                try:
+                    if not an.has_key(prop):
+                        an[prop] = cl.get(a_id, prop)
+                    av = an[prop]
+                except KeyError:
+                    # the node doesn't have a value for this property
+                    if isinstance(propclass, Multilink): av = []
+                    else: av = ''
+                try:
+                    if not bn.has_key(prop):
+                        bn[prop] = cl.get(b_id, prop)
+                    bv = bn[prop]
+                except KeyError:
+                    # the node doesn't have a value for this property
+                    if isinstance(propclass, Multilink): bv = []
+                    else: bv = ''
+
+                # String and Date values are sorted in the natural way
+                if isinstance(propclass, String):
+                    # clean up the strings
+                    if av and av[0] in string.uppercase:
+                        av = an[prop] = av.lower()
+                    if bv and bv[0] in string.uppercase:
+                        bv = bn[prop] = bv.lower()
+                if (isinstance(propclass, String) or
+                        isinstance(propclass, Date)):
+                    # it might be a string that's really an integer
                     try:
-                        if not bn.has_key(prop):
-                            bn[prop] = cl.get(b_id, prop)
-                        bv = bn[prop]
-                    except KeyError:
-                        # the node doesn't have a value for this property
-                        if isinstance(propclass, Multilink): bv = []
-                        else: bv = ''
-
-                    # String and Date values are sorted in the natural way
-                    if isinstance(propclass, String):
-                        # clean up the strings
-                        if av and av[0] in string.uppercase:
-                            av = an[prop] = av.lower()
-                        if bv and bv[0] in string.uppercase:
-                            bv = bn[prop] = bv.lower()
-                    if (isinstance(propclass, String) or
-                            isinstance(propclass, Date)):
-                        # it might be a string that's really an integer
-                        try:
-                            av = int(av)
-                            bv = int(bv)
-                        except:
-                            pass
+                        av = int(av)
+                        bv = int(bv)
+                    except:
+                        pass
+                    if dir == '+':
+                        r = cmp(av, bv)
+                        if r != 0: return r
+                    elif dir == '-':
+                        r = cmp(bv, av)
+                        if r != 0: return r
+
+                # Link properties are sorted according to the value of
+                # the "order" property on the linked nodes if it is
+                # present; or otherwise on the key string of the linked
+                # nodes; or finally on  the node ids.
+                elif isinstance(propclass, Link):
+                    link = db.classes[propclass.classname]
+                    if av is None and bv is not None: return -1
+                    if av is not None and bv is None: return 1
+                    if av is None and bv is None: continue
+                    if link.getprops().has_key('order'):
                         if dir == '+':
-                            r = cmp(av, bv)
+                            r = cmp(link.get(av, 'order'),
+                                link.get(bv, 'order'))
                             if r != 0: return r
                         elif dir == '-':
-                            r = cmp(bv, av)
+                            r = cmp(link.get(bv, 'order'),
+                                link.get(av, 'order'))
                             if r != 0: return r
-
-                    # Link properties are sorted according to the value of
-                    # the "order" property on the linked nodes if it is
-                    # present; or otherwise on the key string of the linked
-                    # nodes; or finally on  the node ids.
-                    elif isinstance(propclass, Link):
-                        link = db.classes[propclass.classname]
-                        if av is None and bv is not None: return -1
-                        if av is not None and bv is None: return 1
-                        if av is None and bv is None: continue
-                        if link.getprops().has_key('order'):
-                            if dir == '+':
-                                r = cmp(link.get(av, 'order'),
-                                    link.get(bv, 'order'))
-                                if r != 0: return r
-                            elif dir == '-':
-                                r = cmp(link.get(bv, 'order'),
-                                    link.get(av, 'order'))
-                                if r != 0: return r
-                        elif link.getkey():
-                            key = link.getkey()
-                            if dir == '+':
-                                r = cmp(link.get(av, key), link.get(bv, key))
-                                if r != 0: return r
-                            elif dir == '-':
-                                r = cmp(link.get(bv, key), link.get(av, key))
-                                if r != 0: return r
-                        else:
-                            if dir == '+':
-                                r = cmp(av, bv)
-                                if r != 0: return r
-                            elif dir == '-':
-                                r = cmp(bv, av)
-                                if r != 0: return r
-
-                    # Multilink properties are sorted according to how many
-                    # links are present.
-                    elif isinstance(propclass, Multilink):
+                    elif link.getkey():
+                        key = link.getkey()
                         if dir == '+':
-                            r = cmp(len(av), len(bv))
+                            r = cmp(link.get(av, key), link.get(bv, key))
                             if r != 0: return r
                         elif dir == '-':
-                            r = cmp(len(bv), len(av))
+                            r = cmp(link.get(bv, key), link.get(av, key))
                             if r != 0: return r
-                    elif isinstance(propclass, Number) or isinstance(propclass, Boolean):
+                    else:
                         if dir == '+':
                             r = cmp(av, bv)
+                            if r != 0: return r
                         elif dir == '-':
                             r = cmp(bv, av)
-                        
-                # end for dir, prop in list:
-            # end for list in sort, group:
+                            if r != 0: return r
+
+                # Multilink properties are sorted according to how many
+                # links are present.
+                elif isinstance(propclass, Multilink):
+                    if dir == '+':
+                        r = cmp(len(av), len(bv))
+                        if r != 0: return r
+                    elif dir == '-':
+                        r = cmp(len(bv), len(av))
+                        if r != 0: return r
+                elif isinstance(propclass, Number) or isinstance(propclass, Boolean):
+                    if dir == '+':
+                        r = cmp(av, bv)
+                    elif dir == '-':
+                        r = cmp(bv, av)
+                    
+            # end for dir, prop in sort, group:
             # if all else fails, compare the ids
             return cmp(a[0], b[0])
 
@@ -1909,13 +1892,18 @@ def __init__(self, db, classname, **properties):
         if not properties.has_key('files'):
             properties['files'] = hyperdb.Multilink("file")
         if not properties.has_key('nosy'):
-            properties['nosy'] = hyperdb.Multilink("user")
+            # note: journalling is turned off as it really just wastes
+            # space. this behaviour may be overridden in an instance
+            properties['nosy'] = hyperdb.Multilink("user", do_journal="no")
         if not properties.has_key('superseder'):
             properties['superseder'] = hyperdb.Multilink(classname)
         Class.__init__(self, db, classname, **properties)
 
 #
 #$Log: not supported by cvs2svn $
+#Revision 1.65  2002/08/30 08:35:45  richard
+#minor edits
+#
 #Revision 1.64  2002/08/22 07:57:11  richard
 #Consistent quoting
 #

roundup/backends/back_gadfly.py

@@ -1,4 +1,4 @@
-# $Id: back_gadfly.py,v 1.6 2002-08-30 08:35:16 richard Exp $
+# $Id: back_gadfly.py,v 1.7 2002-09-01 04:32:30 richard Exp $
 __doc__ = '''
 About Gadfly
 ============
@@ -1469,8 +1469,8 @@ def filter(self, search_matches, filterspec, sort, group):
             sort spec
 
             "filterspec" is {propname: value(s)}
-            "sort" is ['+propname', '-propname', 'propname', ...]
-            "group is ['+propname', '-propname', 'propname', ...]
+            "sort" and "group" are (dir, prop) where dir is '+', '-' or None
+                               and prop is a prop name or None
             "search_matches" is {nodeid: marker}
         '''
         cn = self.classname
@@ -1511,26 +1511,24 @@ def filter(self, search_matches, filterspec, sort, group):
         # figure the order by clause
         orderby = []
         ordercols = []
-        if sort:
-            for entry in sort:
-                if entry[0] != '-':
-                    orderby.append('_'+entry)
-                    ordercols.append(entry)
-                else:
-                    orderby.append('_'+entry[1:]+' desc')
-                    ordercols.append(entry)
+        if sort is not None:
+            if sort[0] != '-':
+                orderby.append('_'+sort[1])
+                ordercols.append(sort[1])
+            else:
+                orderby.append('_'+sort[1]+' desc')
+                ordercols.append(sort[1])
 
         # figure the group by clause
         groupby = []
         groupcols = []
-        if group:
-            for entry in group:
-                if entry[0] != '-':
-                    groupby.append('_'+entry)
-                    groupcols.append(entry)
-                else:
-                    groupby.append('_'+entry[1:]+' desc')
-                    groupcols.append(entry[1:])
+        if group is not None:
+            if group[0] != '-':
+                groupby.append('_'+group[1])
+                groupcols.append(group[1])
+            else:
+                groupby.append('_'+group[1]+' desc')
+                groupcols.append(group[1])
 
         # construct the SQL
         frum = ','.join(frum)
@@ -1743,13 +1741,18 @@ def __init__(self, db, classname, **properties):
         if not properties.has_key('files'):
             properties['files'] = hyperdb.Multilink("file")
         if not properties.has_key('nosy'):
-            properties['nosy'] = hyperdb.Multilink("user")
+            # note: journalling is turned off as it really just wastes
+            # space. this behaviour may be overridden in an instance
+            properties['nosy'] = hyperdb.Multilink("user", do_journal="no")
         if not properties.has_key('superseder'):
             properties['superseder'] = hyperdb.Multilink(classname)
         Class.__init__(self, db, classname, **properties)
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.6  2002/08/30 08:35:16  richard
+# very basic filter support
+#
 # Revision 1.5  2002/08/23 05:33:32  richard
 # implemented multilink changes (and a unit test)
 #