merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -5,6 +5,7 @@ are given with the most recent entry first.
 Fixed:
 - rdbms backend full text search failure after import (sf bug 980314)
 - rdbms backends not filtering correctly on link=None
+- fix anydbm journal import (sf bug 983166)
 
 
 2004-06-24 0.7.5

doc/Makefile

@@ -1,5 +1,5 @@
-STXTOHTML = rst2html
-STXTOHT = rst2ht.py
+STXTOHTML = rst2html.py
+STXTOHT = python /usr/bin/rst2ht.py
 WEBDIR = ../../htdocs/htdocs/doc-0.7
 
 SOURCE = announcement.txt customizing.txt developers.txt FAQ.txt features.txt \

doc/customizing.txt

@@ -2460,13 +2460,6 @@ is also done in the ``open()`` function of ``dbinit.py``.
 There are currently two loops which set up permissions and then assign
 them to various roles. Simply add the new "category" to both lists::
 
-    # new permissions for this schema
-    for cl in 'issue', 'file', 'msg', 'user', 'category':
-        db.security.addPermission(name="Edit", klass=cl,
-            description="User is allowed to edit "+cl)
-        db.security.addPermission(name="View", klass=cl,
-            description="User is allowed to access "+cl)
-
     # Assign the access and edit permissions for issue, file and message
     # to regular users now
     for cl in 'issue', 'file', 'msg', 'category':
@@ -2475,24 +2468,8 @@ them to various roles. Simply add the new "category" to both lists::
         p = db.security.getPermission('Edit', cl)
         db.security.addPermissionToRole('User', p)
 
-So you are in effect doing the following (with 'cl' substituted by its
-value)::
-
-    db.security.addPermission(name="Edit", klass='category',
-        description="User is allowed to edit "+'category')
-    db.security.addPermission(name="View", klass='category',
-        description="User is allowed to access "+'category')
-
-which is creating two permission types; that of editing and viewing
-"category" objects respectively. Then the following lines assign those
-new permissions to the "User" role, so that normal users can view and
-edit "category" objects::
-
-    p = db.security.getPermission('View', 'category')
-    db.security.addPermissionToRole('User', p)
-
-    p = db.security.getPermission('Edit', 'category')
-    db.security.addPermissionToRole('User', p)
+These lines assign the View and Edit Permissions to the "User" role, so
+that normal users can view and edit "category" objects.
 
 This is all the work that needs to be done for the database. It will
 store categories, and let users view and edit them. Now on to the

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.146.2.12 2004-06-28 23:15:39 richard Exp $
+#$Id: back_anydbm.py,v 1.146.2.13 2004-07-01 03:58:34 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
 versions >2.1.1 (the dumbdbm fallback in 2.1.1 and earlier has several
@@ -708,6 +708,7 @@ def doSetJournal(self, classname, nodeid, journal):
             if isinstance(params, type({})):
                 if action in ('set', 'create'):
                     params = self.serialise(classname, params)
+            journaldate = journaldate.serialise()
             l.append((nodeid, journaldate, journaltag, action, params))
         db = self.getCachedJournalDB(classname)
         db[nodeid] = marshal.dumps(l)
@@ -2183,11 +2184,12 @@ def index(self, nodeid):
         Pass on the content-type property for the content property.
         '''
         Class.index(self, nodeid)
-        mimetype = self.get(nodeid, 'type')
-        if not mimetype:
-            mimetype = self.default_mime_type
+        try:
+            mime_type = self.get(nodeid, 'type', self.default_mime_type)
+        except KeyError:
+            mime_type = self.default_mime_type
         self.db.indexer.add_text((self.classname, nodeid, 'content'),
-                    self.get(nodeid, 'content'), mimetype)
+            str(self.get(nodeid, 'content')), mime_type)
 
 # deviation from spec - was called ItemClass
 class IssueClass(Class, roundupdb.IssueClass):

roundup/backends/back_metakit.py

@@ -1,4 +1,4 @@
-# $Id: back_metakit.py,v 1.70.2.5 2004-06-24 09:56:49 richard Exp $
+# $Id: back_metakit.py,v 1.70.2.6 2004-07-01 03:58:34 richard Exp $
 '''Metakit backend for Roundup, originally by Gordon McMillan.
 
 Known Current Bugs:
@@ -1947,11 +1947,12 @@ def undo(fnm=nm):
 
     def index(self, nodeid):
         Class.index(self, nodeid)
-        mimetype = self.get(nodeid, 'type')
-        if not mimetype:
-            mimetype = self.default_mime_type
+        try:
+            mime_type = self.get(nodeid, 'type', self.default_mime_type)
+        except KeyError:
+            mime_type = self.default_mime_type
         self.db.indexer.add_text((self.classname, nodeid, 'content'),
-                    self.get(nodeid, 'content'), mimetype)
+            str(self.get(nodeid, 'content')), mime_type)
 
 class IssueClass(Class, roundupdb.IssueClass):
     ''' The newly-created class automatically includes the "messages",

roundup/backends/rdbms_common.py

@@ -1,4 +1,4 @@
-# $Id: rdbms_common.py,v 1.98.2.13 2004-06-29 05:53:37 richard Exp $
+# $Id: rdbms_common.py,v 1.98.2.14 2004-07-01 03:58:34 richard Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -2650,9 +2650,10 @@ def index(self, nodeid):
 
         Pass on the content-type property for the content property.
         '''
-        Class.index(nodeid)
-        mime_type = self.get(itemid, 'type')
-        if not mime_type:
+        Class.index(self, nodeid)
+        try:
+            mime_type = self.get(nodeid, 'type', self.default_mime_type)
+        except KeyError:
             mime_type = self.default_mime_type
         self.db.indexer.add_text((self.classname, nodeid, 'content'),
             str(self.get(nodeid, 'content')), mime_type)