merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -1,6 +1,11 @@
 This file contains the changes to the Roundup system over time. The entries
 are given with the most recent entry first.
 
+2004-??-?? 0.7.6
+Fixed:
+- rdbms backend full text search failure after import (sf bug 980314)
+
+
 2004-06-24 0.7.5
 Fixed:
 - force lookup of journal props in anydbm filtering

doc/index.txt

@@ -89,6 +89,7 @@ Gus Gollings,
 Dan Grassi,
 Engelbert Gruber,
 Juergen Hermann,
+Uwe Hoffmann,
 Tobias Hunger,
 Simon Hyde,
 Christophe Kalt,

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.11 2004-06-24 07:14:26 richard Exp $
+#$Id: back_anydbm.py,v 1.146.2.12 2004-06-28 23:15:39 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
@@ -2166,15 +2166,29 @@ def set(self, itemid, **propvalues):
         return propvalues
 
     def getprops(self, protected=1):
-        ''' In addition to the actual properties on the node, these methods
-            provide the "content" property. If the "protected" flag is true,
-            we include protected properties - those which may not be
-            modified.
+        '''In addition to the actual properties on the node, these methods
+        provide the "content" property. If the "protected" flag is true,
+        we include protected properties - those which may not be
+        modified.
+
+        Note that the content prop is indexed separately, hence no indexme.
         '''
         d = Class.getprops(self, protected=protected).copy()
         d['content'] = hyperdb.String()
         return d
 
+    def index(self, nodeid):
+        '''Add (or refresh) the node to search indexes.
+
+        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
+        self.db.indexer.add_text((self.classname, nodeid, 'content'),
+                    self.get(nodeid, 'content'), mimetype)
+
 # deviation from spec - was called ItemClass
 class IssueClass(Class, roundupdb.IssueClass):
     # Overridden methods:

roundup/backends/rdbms_common.py

@@ -1,4 +1,4 @@
-# $Id: rdbms_common.py,v 1.98.2.11 2004-06-24 07:14:48 richard Exp $
+# $Id: rdbms_common.py,v 1.98.2.12 2004-06-28 23:15:39 richard Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -2421,7 +2421,10 @@ def import_list(self, propnames, proplist):
         # make the new node's property map
         d = {}
         retire = 0
-        newid = None
+        if not "id" in propnames:
+            newid = self.db.newid(self.classname)
+        else:
+            newid = eval(proplist[propnames.index("id")])
         for i in range(len(propnames)):
             # Use eval to reverse the repr() used to output the CSV
             value = eval(proplist[i])
@@ -2431,7 +2434,6 @@ def import_list(self, propnames, proplist):
 
             # "unmarshal" where necessary
             if propname == 'id':
-                newid = value
                 continue
             elif propname == 'is retired':
                 # is the item retired?
@@ -2455,6 +2457,11 @@ def import_list(self, propnames, proplist):
                 pwd.unpack(value)
                 value = pwd
             d[propname] = value
+            if isinstance(prop, String) and prop.indexme:
+                if type(value) != type('') and type(value) != type(u''):
+                    raise TypeError, 'new property "%s" not a string'%key
+                self.db.indexer.add_text((self.classname, newid, propname),
+                    value)
 
         # get a new id if necessary
         if newid is None:
@@ -2595,10 +2602,12 @@ def get(self, nodeid, propname, default=_marker, cache=1):
             return Class.get(self, nodeid, propname)
 
     def getprops(self, protected=1):
-        ''' In addition to the actual properties on the node, these methods
-            provide the "content" property. If the "protected" flag is true,
-            we include protected properties - those which may not be
-            modified.
+        '''In addition to the actual properties on the node, these methods
+        provide the "content" property. If the "protected" flag is true,
+        we include protected properties - those which may not be
+        modified.
+
+        Note that the content prop is indexed separately, hence no indexme.
         '''
         d = Class.getprops(self, protected=protected).copy()
         d['content'] = hyperdb.String()
@@ -2633,6 +2642,18 @@ def set(self, itemid, **propvalues):
         self.fireReactors('set', itemid, oldvalues)
         return propvalues
 
+    def index(self, nodeid):
+        '''Add (or refresh) the node to search indexes.
+
+        Pass on the content-type property for the content property.
+        '''
+        Class.index(nodeid)
+        mime_type = self.get(itemid, 'type')
+        if not mime_type:
+            mime_type = self.default_mime_type
+        self.db.indexer.add_text((self.classname, nodeid, 'content'),
+            str(self.get(nodeid, 'content')), mime_type)
+
 # XXX deviation from spec - was called ItemClass
 class IssueClass(Class, roundupdb.IssueClass):
     # Overridden methods: