better string splitting

Author: Richard Jones

roundup/admin.py

@@ -16,12 +16,12 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: admin.py,v 1.52 2003-04-17 07:33:08 richard Exp $
+# $Id: admin.py,v 1.53 2003-05-09 03:32:41 richard Exp $
 
 '''Administration commands for maintaining Roundup trackers.
 '''
 
-import sys, os, getpass, getopt, re, UserDict, shlex, shutil, rfc822
+import sys, os, getpass, getopt, re, UserDict, shutil, rfc822
 try:
     import csv
 except ImportError:

roundup/cgi/client.py

@@ -1,4 +1,4 @@
-# $Id: client.py,v 1.115 2003-05-09 01:47:50 richard Exp $
+# $Id: client.py,v 1.116 2003-05-09 03:32:41 richard Exp $
 
 __doc__ = """
 WWW request handler (also used in the stand-alone server).
@@ -8,7 +8,7 @@
 import binascii, Cookie, time, random, MimeWriter, smtplib, socket, quopri
 import stat, rfc822, string
 
-from roundup import roundupdb, date, hyperdb, password
+from roundup import roundupdb, date, hyperdb, password, token
 from roundup.i18n import _
 from roundup.cgi.templating import Templates, HTMLRequest, NoTemplate
 from roundup.cgi import cgitb
@@ -1323,8 +1323,8 @@ def searchAction(self, wcre=re.compile(r'[\s,]+')):
                     continue
                 if isinstance(props[key], hyperdb.String):
                     v = self.form[key].value
-                    l = wcre.split(v)
-                    if len(l) > 1:
+                    l = token.token_split(v)
+                    if len(l) > 1 or l[0] != v:
                         self.form.value.remove(self.form[key])
                         # replace the single value with the split list
                         for v in l: