--- ZSQLExtend/ZSQLExtend.py	2005/10/11 20:05:06	1.67
+++ ZSQLExtend/ZSQLExtend.py	2005/10/12 19:36:56	1.68
@@ -231,7 +231,7 @@ class ZSQLExtendFolder(Folder,Persistent
         return ret
 
 
-    def ZSQLOptionsFromCRList(self,fieldname,listField, multiple='',start=None,startValue=None,size=None):
+    def ZSQLOptionsFromCRList(self,fieldname,listField, multiple='',start=None,startValue=None,size=None,selected=None):
         """generate select oprions form a cr seperated list"""
         fields=listField.split("\n")
         if size:
@@ -249,7 +249,10 @@ class ZSQLExtendFolder(Folder,Persistent
                     
             ret+="""<option value="%s" >%s</option>"""%(startValue,start)
         for field in fields:
-            ret+="""<option value="%s">%s</option>"""%(field.encode('utf-8'),field.encode('utf-8'))
+            if selected and (field in selected.split("\n")):
+                 ret+="""<option selected value="%s">%s</option>"""%(field.encode('utf-8'),field.encode('utf-8'))
+            else:
+                 ret+="""<option value="%s">%s</option>"""%(field.encode('utf-8'),field.encode('utf-8'))
         ret+="""</select>"""
         return ret
 
@@ -457,19 +460,20 @@ class ZSQLExtendFolder(Folder,Persistent
         else:
             return True
         
-    def ZSQLChange(self,format=None,RESPONSE=None,**argv):
+    def ZSQLChange(self,format=None,RESPONSE=None,USE_FORM=None,**argv):
         """change entries"""
         #qs=self.REQUEST['QUERY_STRING']
         # very bad hack
         
         qs_temp=[]
-    
-#        for a in self.REQUEST.form.keys():
-#            qs_temp.append(a+"="+urllib.quote(str(self.REQUEST.form[a])))
+        if USE_FORM or RESPONSE:
+            for a in self.REQUEST.form.keys():
+                qs_temp.append(a+"="+urllib.quote(str(self.REQUEST.form[a])))
 
         
         
         for field in argv.keys():
+                
                    if field[0]=="_":
                        fieldTmp="-"+field[1:]
                    else:
@@ -959,9 +963,11 @@ class ZSQLExtendFolder(Folder,Persistent
         else:
             return value
         
-    def ZSQLQuery(self,query):
+    def ZSQLQuery(self,query,debug=None):
         """query"""
-
+        if debug:
+            zLOG.LOG("ZSQLQuery", zLOG.INFO, query)
+            
         return self.ZSQLSimpleSearch(query)