Fixes for SourceForge tracker bugs.

- fixed filter() with no sort/group [SF#618614]
- fixed register with no session [SF#618611]
- fixed log / pid file path handling in roundup-server [SF#617981]
- fixed old gadfly compatibiltiy problem, for sure this time [SF#612873]

Author: Richard Jones

CHANGES.txt

@@ -6,6 +6,10 @@ are given with the most recent entry first.
 - metakit cleanups
 - nicer "navigation" style in index views
 - handle missing Link values in anydbm backend set() operation
+- fixed filter() with no sort/group (sf bug 618614)
+- fixed register with no session (sf bug 618611)
+- fixed log / pid file path handling in roundup-server (sf bug 617981)
+- fixed old gadfly compatibiltiy problem, for sure this time (sf bug 612873)
 
 
 2002-10-02 0.5.0

MANIFEST.in

@@ -9,4 +9,5 @@ recursive-exclude roundup *.pyc *.pyo .cvsignore
 recursive-exclude frontends *.pyc *.pyo .cvsignore
 include run_tests *.txt
 exclude BUILD.txt I18N_PROGRESS.txt TODO.txt
+exclude doc/security.txt doc/templating.txt
 

doc/Makefile

@@ -3,8 +3,7 @@ STXTOHTML = -c "from docutils.core import publish;publish(writer_name='html')"
 
 SOURCE = announcement.txt customizing.txt developers.txt FAQ.txt features.txt \
     glossary.txt implementation.txt index.txt design.txt \
-    installation.txt security.txt upgrading.txt user_guide.txt \
-    maintenance.txt
+    installation.txt upgrading.txt user_guide.txt maintenance.txt
 
 COMPILED := $(SOURCE:.txt=.html)
 

roundup/backends/__init__.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: __init__.py,v 1.19 2002-10-03 06:56:29 richard Exp $
+# $Id: __init__.py,v 1.20 2002-10-07 00:52:51 richard Exp $
 
 ''' Container for the hyperdb storage backend implementations.
 
@@ -46,7 +46,11 @@
     import gadfly
     import gadfly.client
 except ImportError, message:
-    if str(message) != 'No module named gadfly': raise
+    if str(message) == 'No module named client':
+        # don't keep the old gadfly around
+        del gadfly
+    elif str(message) != 'No module named gadfly':
+        raise
 else:
     import back_gadfly
     gadfly = back_gadfly

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.87 2002-10-04 06:30:30 richard Exp $
+#$Id: back_anydbm.py,v 1.88 2002-10-07 00:52:51 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
@@ -1531,8 +1531,8 @@ def list(self):
         l.sort()
         return l
 
-    def filter(self, search_matches, filterspec, sort, group, 
-            num_re = re.compile('^\d+$')):
+    def filter(self, search_matches, filterspec, sort=(None,None),
+            group=(None,None), num_re = re.compile('^\d+$')):
         ''' Return a list of the ids of the active nodes in this class that
             match the 'filter' spec, sorted by the group spec and then the
             sort spec.

roundup/backends/back_gadfly.py

@@ -1,4 +1,4 @@
-# $Id: back_gadfly.py,v 1.28 2002-10-03 06:56:29 richard Exp $
+# $Id: back_gadfly.py,v 1.29 2002-10-07 00:52:51 richard Exp $
 ''' Gadlfy relational database hypderb backend.
 
 About Gadfly
@@ -137,7 +137,8 @@ def load_journal(self, classname, cols, nodeid):
         return res
 
 class GadflyClass:
-    def filter(self, search_matches, filterspec, sort, group):
+    def filter(self, search_matches, filterspec, sort=(None,None),
+            group=(None,None)):
         ''' Gadfly doesn't have a LIKE predicate :(
         '''
         cn = self.classname

roundup/backends/back_metakit.py

@@ -738,10 +738,10 @@ def addprop(self, **properties):
         view = self.__getview()
         self.db.commit()
     # ---- end of ping's spec
-    def filter(self, search_matches, filterspec, sort, group):
+    def filter(self, search_matches, filterspec, sort=(None,None),
+            group=(None,None)):
         # search_matches is None or a set (dict of {nodeid: {propname:[nodeid,...]}})
         # filterspec is a dict {propname:value}
-        # sort and group are lists of propnames
         # sort and group are (dir, prop) where dir is '+', '-' or None
         #                    and prop is a prop name or None
 

roundup/backends/rdbms_common.py

@@ -1,4 +1,4 @@
-# $Id: rdbms_common.py,v 1.20 2002-10-03 06:56:29 richard Exp $
+# $Id: rdbms_common.py,v 1.21 2002-10-07 00:52:51 richard Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -1708,7 +1708,8 @@ def list(self):
         '''
         return self.db.getnodeids(self.classname, retired=0)
 
-    def filter(self, search_matches, filterspec, sort, group):
+    def filter(self, search_matches, filterspec, sort=(None,None),
+            group=(None,None)):
         ''' Return a list of the ids of the active nodes in this class that
             match the 'filter' spec, sorted by the group spec and then the
             sort spec

roundup/cgi/client.py

@@ -1,4 +1,4 @@
-# $Id: client.py,v 1.49 2002-10-03 06:56:29 richard Exp $
+# $Id: client.py,v 1.50 2002-10-07 00:52:51 richard Exp $
 
 __doc__ = """
 WWW request handler (also used in the stand-alone server).
@@ -603,8 +603,8 @@ def registerAction(self):
         # re-open the database for real, using the user
         self.opendb(self.user)
 
-        # update the user's session
-        if self.session:
+        # if we have a session, update it
+        if hasattr(self, 'session'):
             self.db.sessions.set(self.session, user=self.user,
                 last_use=time.time())
         else:

roundup/hyperdb.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: hyperdb.py,v 1.83 2002-10-03 06:56:29 richard Exp $
+# $Id: hyperdb.py,v 1.84 2002-10-07 00:52:51 richard Exp $
 
 """
 Hyperdatabase implementation, especially field types.
@@ -512,11 +512,20 @@ def find(self, **propspec):
         """
         raise NotImplementedError
 
-    def filter(self, search_matches, filterspec, sort, group, 
-            num_re = re.compile('^\d+$')):
+    def filter(self, search_matches, filterspec, sort=(None,None),
+            group=(None,None)):
         ''' Return a list of the ids of the active nodes in this class that
             match the 'filter' spec, sorted by the group spec and then the
-            sort spec
+            sort spec.
+
+            "filterspec" is {propname: value(s)}
+            "sort" and "group" are (dir, prop) where dir is '+', '-' or None
+                               and prop is a prop name or None
+            "search_matches" is {nodeid: marker}
+
+            The filter must match all properties specificed - but if the
+            property value to match is a list, any one of the values in the
+            list may match for that property to match.
         '''
         raise NotImplementedError