fixed error in indexargs_url (thanks Patrick Ohly)

fixed getnode [SF#684531]

Author: Richard Jones

CHANGES.txt

@@ -43,8 +43,11 @@ are given with the most recent entry first.
   return positive values..." (literal 0xffff0000 in portalocker.py)
 - fixed ZPT code generating SyntaxWarning for assignment to None
 - add "ago" to intervals in the past (sf bug 679232)
+- clarified licensing
 - another attempt to fix cookie misbehaviour - customise cookie name using
   tracker name
+- fixed error in indexargs_url (thanks Patrick Ohly)
+- fixed getnode (sf bug 684531)
 
 
 2003-??-?? 0.5.6

doc/index.txt

@@ -69,6 +69,7 @@ Luke Opperman,
 Will Partain,
 Bernhard Reiter,
 John P. Rouillard,
+Florian Schulze,
 Dougal Scott,
 Stefan Seefeld,
 Jeffrey P Shell,

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.100 2003-02-06 05:43:47 richard Exp $
+#$Id: back_anydbm.py,v 1.101 2003-02-12 00:00:18 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
@@ -30,7 +30,7 @@
 from roundup.indexer import Indexer
 from roundup.backends import locking
 from roundup.hyperdb import String, Password, Date, Interval, Link, \
-    Multilink, DatabaseError, Boolean, Number
+    Multilink, DatabaseError, Boolean, Number, Node
 
 #
 # Now the database

roundup/backends/back_metakit.py

@@ -50,7 +50,7 @@ def Database(config, journaltag=None):
             pass
     return db
 
-class _Database(hyperdb.Database):
+class _Database(hyperdb.Database, roundupdb.Database):
     def __init__(self, config, journaltag=None):
         self.config = config
         self.journaltag = journaltag
@@ -1206,13 +1206,16 @@ def __init__(self, db, classname, **properties):
 
     def get(self, nodeid, propname, default=_marker, cache=1):
         x = Class.get(self, nodeid, propname, default, cache)
+        poss_msg = 'Possibly an access right configuration problem.'
         if propname == 'content':
             if x.startswith('file:'):
                 fnm = x[5:]
                 try:
                     x = open(fnm, 'rb').read()
-                except Exception, e:
-                    x = repr(e)
+                except IOError, (strerror):
+                    # XXX by catching this we donot see an error in the log.
+                    return 'ERROR reading file: %s%s\n%s\n%s'%(
+                            self.classname, nodeid, poss_msg, strerror)
         return x
 
     def create(self, **propvalues):

roundup/backends/rdbms_common.py

@@ -1,4 +1,4 @@
-# $Id: rdbms_common.py,v 1.31 2003-02-08 15:31:28 kedder Exp $
+# $Id: rdbms_common.py,v 1.32 2003-02-12 00:00:25 richard Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -27,7 +27,7 @@
 # roundup modules
 from roundup import hyperdb, date, password, roundupdb, security
 from roundup.hyperdb import String, Password, Date, Interval, Link, \
-    Multilink, DatabaseError, Boolean, Number
+    Multilink, DatabaseError, Boolean, Number, Node
 from roundup.backends import locking
 
 # support

roundup/cgi/client.py

@@ -1,4 +1,4 @@
-# $Id: client.py,v 1.77 2003-02-07 04:49:13 richard Exp $
+# $Id: client.py,v 1.78 2003-02-12 00:00:28 richard Exp $
 
 __doc__ = """
 WWW request handler (also used in the stand-alone server).
@@ -1166,10 +1166,6 @@ def _post_editnode(self, nid):
 
            This is typically used on, eg. the file upload page to indicated
            which issue to link the file to.
-
-           TODO: I suspect that this and newfile will go away now that
-           there's the ability to upload a file using the issue :file form
-           element!
         '''
         cn = self.classname
         cl = self.db.classes[cn]

roundup/cgi/templating.py

@@ -1526,7 +1526,7 @@ def indexargs_url(self, url, args):
             else:
                 val = self.group[1]
             l.append(':group=%s'%val)
-        if self.filter and not args.has_key(':columns'):
+        if self.filter and not args.has_key(':filter'):
             l.append(':filter=%s'%(','.join(self.filter)))
         for k,v in self.filterspec.items():
             if not args.has_key(k):