rdbms backend full text search failure after import [SF#980314]

Author: Richard Jones

CHANGES.txt

@@ -17,6 +17,11 @@ Feature:
 
 2004-??-?? 0.7.5
 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
 - fixed lookup of "missing" Link values for new props in anydbm backend
 - allow list of values for id, Number and Boolean filtering in anydbm

doc/index.txt

@@ -90,6 +90,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.157 2004-06-24 06:39:07 richard Exp $
+#$Id: back_anydbm.py,v 1.158 2004-06-28 23:13:05 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/back_metakit.py

@@ -1,4 +1,4 @@
-# $Id: back_metakit.py,v 1.76 2004-06-24 09:57:49 richard Exp $
+# $Id: back_metakit.py,v 1.77 2004-06-28 23:13:05 richard Exp $
 '''Metakit backend for Roundup, originally by Gordon McMillan.
 
 Known Current Bugs:
@@ -1946,6 +1946,10 @@ def undo(fnm=nm):
         self.fireReactors('set', oldnode, 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(self, nodeid)
         mimetype = self.get(nodeid, 'type')
         if not mimetype:

roundup/backends/rdbms_common.py

@@ -1,4 +1,4 @@
-# $Id: rdbms_common.py,v 1.112 2004-06-24 06:39:07 richard Exp $
+# $Id: rdbms_common.py,v 1.113 2004-06-28 23:13:05 richard Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -2426,7 +2426,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])
@@ -2436,7 +2439,6 @@ def import_list(self, propnames, proplist):
 
             # "unmarshal" where necessary
             if propname == 'id':
-                newid = value
                 continue
             elif propname == 'is retired':
                 # is the item retired?
@@ -2460,6 +2462,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:
@@ -2600,10 +2607,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()
@@ -2638,6 +2647,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:

test/db_test_base.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: db_test_base.py,v 1.34 2004-06-24 06:39:07 richard Exp $ 
+# $Id: db_test_base.py,v 1.35 2004-06-28 23:13:06 richard Exp $ 
 
 import unittest, os, shutil, errno, imp, sys, time, pprint
 
@@ -703,7 +703,6 @@ def testFileClassReindexing(self):
         self.assertEquals(self.db.indexer.search(['hello'], self.db.issue),
             {i1: {'files': [f2]}})
 
-
     def testForcedReindexing(self):
         self.db.issue.create(title="flebble frooz")
         self.db.commit()