merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -16,6 +16,7 @@ Fixed:
 - updated searching / indexing docs
 - fix "(list)" popup when list is one item long (sf bug 1064716)
 - have RDBMS full-text indexer do AND searching (sf bug 1055435)
+- handle spaces in String index params in batching (sf bug 1054224)
 
 
 2004-10-26 0.7.9

roundup/cgi/templating.py

@@ -1975,9 +1975,13 @@ def indexargs_form(self, columns=1, sort=1, group=1, filter=1,
         if filter and self.filter:
             l.append(s%(sc+'filter', ','.join(self.filter)))
         if filterspec:
+            props = self.client.db.getclass(self.classname).getprops()
             for k,v in self.filterspec.items():
                 if type(v) == type([]):
-                    l.append(s%(k, ','.join(v)))
+                    if isinstance(props[k], hyperdb.String):
+                        l.append(s%(k, ' '.join(v)))
+                    else:
+                        l.append(s%(k, ','.join(v)))
                 else:
                     l.append(s%(k, v))
         if self.search_text:
@@ -2023,10 +2027,14 @@ def indexargs_url(self, url, args):
             l.append(sc+'startwith=%s'%self.startwith)
 
         # finally, the remainder of the filter args in the request
+        props = self.client.db.getclass(self.classname).getprops()
         for k,v in self.filterspec.items():
             if not args.has_key(k):
                 if type(v) == type([]):
-                    l.append('%s=%s'%(k, ','.join(v)))
+                    if isinstance(props[k], hyperdb.String):
+                        l.append(s%(k, ' '.join(v)))
+                    else:
+                        l.append(s%(k, ','.join(v)))
                 else:
                     l.append('%s=%s'%(k, v))
         return '%s?%s'%(url, '&'.join(l))