merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -19,6 +19,7 @@ Fixed:
 - NumberHTMLProperty should return '' not "None" if not set (thanks
   William)
 - ensure multilink ordering in RDBMS backends (thanks Marcus Priesch)
+- always honor indexme property on Strings (sf patch 1063711)
 
 
 2004-10-15 0.7.8

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.18 2004-07-22 04:46:10 richard Exp $
+#$Id: back_anydbm.py,v 1.146.2.19 2004-11-10 22:26:07 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
@@ -909,7 +909,9 @@ def create_inner(self, **propvalues):
             elif isinstance(prop, String):
                 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, key), value)
+                if prop.indexme:
+                    self.db.indexer.add_text((self.classname, newid, key),
+                        value)
 
             elif isinstance(prop, Password):
                 if not isinstance(value, password.Password):
@@ -1230,8 +1232,9 @@ def set_inner(self, nodeid, **propvalues):
             elif isinstance(prop, String):
                 if value is not None and type(value) != type('') and type(value) != type(u''):
                     raise TypeError, 'new property "%s" not a string'%propname
-                self.db.indexer.add_text((self.classname, nodeid, propname),
-                    value)
+                if prop.indexme:
+                    self.db.indexer.add_text((self.classname, nodeid, propname),
+                        value)
 
             elif isinstance(prop, Password):
                 if not isinstance(value, password.Password):

roundup/backends/rdbms_common.py

@@ -1,4 +1,4 @@
-# $Id: rdbms_common.py,v 1.98.2.26 2004-11-09 04:10:28 richard Exp $
+# $Id: rdbms_common.py,v 1.98.2.27 2004-11-10 22:26:07 richard Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -1420,7 +1420,9 @@ def create_inner(self, **propvalues):
             elif isinstance(prop, String):
                 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, key), value)
+                if prop.indexme:
+                    self.db.indexer.add_text((self.classname, newid, key),
+                        value)
 
             elif isinstance(prop, Password):
                 if not isinstance(value, password.Password):
@@ -1696,8 +1698,9 @@ def set_inner(self, nodeid, **propvalues):
             elif isinstance(prop, String):
                 if value is not None and type(value) != type('') and type(value) != type(u''):
                     raise TypeError, 'new property "%s" not a string'%propname
-                self.db.indexer.add_text((self.classname, nodeid, propname),
-                    value)
+                if prop.indexme:
+                    self.db.indexer.add_text((self.classname, nodeid, propname),
+                        value)
 
             elif isinstance(prop, Password):
                 if not isinstance(value, password.Password):
@@ -2489,11 +2492,14 @@ def import_list(self, propnames, proplist):
                 pwd.unpack(value)
                 value = pwd
             d[propname] = value
-            if isinstance(prop, String) and prop.indexme:
+            if isinstance(prop, String):
                 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)
+                    raise TypeError, \
+                        'new property "%(propname)s" not a string: %(value)r' \
+                        % locals()
+                if prop.indexme:
+                    self.db.indexer.add_text((self.classname, newid, propname),
+                        value)
 
         # get a new id if necessary
         if newid is None: