--- ZSQLExtend/ZSQLExtend.py	2005/10/11 13:15:01	1.66
+++ ZSQLExtend/ZSQLExtend.py	2005/10/11 20:05:06	1.67
@@ -42,7 +42,7 @@ def sql_quote(v):
     quote_dict = {"\'": "''", "\\": "\\\\"}
     for dkey in quote_dict.keys():
         if string.find(v, dkey) >= 0:
-            v=join(split(v,dkey),quote_dict[dkey])
+            v=string.join(string.split(v,dkey),quote_dict[dkey])
     return "'%s'" % v
 
 def showSQLConnectionIDs(self):
@@ -351,7 +351,7 @@ class ZSQLExtendFolder(Folder,Persistent
     
     def ZSQLSimpleSearch(self,query=None,max_rows=1000000):
         """simple search"""
-
+        
         if not query:
             query=self.query
         
@@ -464,10 +464,10 @@ class ZSQLExtendFolder(Folder,Persistent
         
         qs_temp=[]
     
-        for a in self.REQUEST.form.keys():
-            qs_temp.append(a+"="+urllib.quote(str(self.REQUEST.form[a])))
+#        for a in self.REQUEST.form.keys():
+#            qs_temp.append(a+"="+urllib.quote(str(self.REQUEST.form[a])))
 
-        qs=string.join(qs_temp,",")
+        
         
         for field in argv.keys():
                    if field[0]=="_":
@@ -475,17 +475,18 @@ class ZSQLExtendFolder(Folder,Persistent
                    else:
                        fieldTmp=field
                        
-                   qs+=",%s=%s"%(fieldTmp,argv[field])
-        
+                   qs_temp.append("%s=%s"%(fieldTmp,argv[field]))
         
+        qs=string.join(qs_temp,",")
         changeList=[]
-        for q in qs.split(","):
         
+        for q in qs.split(","):
+            
             name=urllib.unquote(re.sub("r'+'"," ",q.split("=")[0].lower()))
             value="=".join(q.split("=")[1:])
             value=re.sub(r'\+'," ",value)
             value=urllib.unquote(value)
-
+        
             if name=="-table":
                     table=urllib.unquote(value)
             elif name=="-identify":