--- ZSQLExtend/ZSQLExtend.py	2006/04/20 17:40:11	1.81
+++ ZSQLExtend/ZSQLExtend.py	2006/04/24 16:09:52	1.82
@@ -164,7 +164,7 @@ class ZSQLExtendFolder(Folder,Persistent
         #check if table exists
         
         qstr="""select relname from pg_class where relname = '%s'"""%table
-        if len (self.ZSQLSimpleSearch(qstr))<1: # if not the create the table
+        if not(self.ZSQLSimpleSearch(qstr)) or (len (self.ZSQLSimpleSearch(qstr))<1): # if not the create the table
             columns=[]
             create=True    
         else:
@@ -269,7 +269,7 @@ class ZSQLExtendFolder(Folder,Persistent
 
                        
                         fields=",".join(dataSet.keys())
-                        values=",".join([""" %s """%self.ZSQLQuote(x) for x in dataSet.keys()])
+                        values=",".join([""" %s """%self.ZSQLQuote(dataSet[x]) for x in dataSet.keys()])
                   
                         
                         queryStr="""INSERT INTO %s  (%s) VALUES (%s)"""%(table,fields,values)
@@ -632,7 +632,7 @@ class ZSQLExtendFolder(Folder,Persistent
         ret+="""</select>"""
         return ret
 
-    def ZSQLOptionsFromSearchList(self,fieldname,results,fieldName,valueName=None,start=None, multiple='',startValue=None,additionalSelect="",size=None,linelen=None):
+    def ZSQLOptionsFromSearchList(self,fieldname,results,fieldName,valueName=None,start=None, multiple='',startValue=None,additionalSelect="",size=None,linelen=None,selected=None):
         """generate select options form a search list
         es wird
         <select name=fieldname mutiple>
@@ -667,8 +667,14 @@ class ZSQLExtendFolder(Folder,Persistent
             field=getattr(result,fieldName)
             fieldValue=getattr(result,valueName)
             if fieldValue:
+                print "XXX",field,repr(type(field)),repr(type(selected))
                 if not linelen:
-                    ret+="""<option value="%s">%s</option>"""%(field,fieldValue)
+                    
+                    if field == selected:
+                        print "huhu"
+                        ret+="""<option value="%s" selected>%s</option>"""%(field,fieldValue)
+                    else:
+                        ret+="""<option value="%s">%s</option>"""%(field,fieldValue)
                 else:
                     mist = """%s"""%(fieldValue)
                     if len(mist) > string.atoi(linelen):
@@ -960,7 +966,7 @@ class ZSQLExtendFolder(Folder,Persistent
                    if field[0]=="_":
                        fieldTmp="-"+field[1:]
                    else:
-                       fieldTmp=urllib.unqoute(field)
+                       fieldTmp=urllib.unquote(field)
                        
                    qs+=",%s=%s"%(fieldTmp,argv[field])
                    
@@ -989,19 +995,21 @@ class ZSQLExtendFolder(Folder,Persistent
 
         qs=string.join(delEmpty(qs.split(",")),",")
 
-        if storename:
-            """store"""
-        else:
+        if not storename:
             storename="foundCount"
 
         #store query for further usage
         self.REQUEST.SESSION['query']=qs
-
+        print "st",storename,qs                          
         #print "calling Query with",repr(NoQuery)
         ret=self.parseQueryString(qs,"-",select=select,storemax="yes",storename=storename,tableExt=tableExt,NoQuery=NoQuery,NoLimit=NoLimit,restrictField=restrictField,restrictConnect=restrictConnect,filter=filter)
         #print self.REQUEST.SESSION["foundCount"]
         
-        
+#        if not hasattr(self,'_v_results'):
+#                                  self._v_results={}
+#  
+#                                  
+#        self._v_results[urllib.quote(qs)]=ret[0:]
 
         return ret
 
@@ -1256,7 +1264,7 @@ class ZSQLExtendFolder(Folder,Persistent
                     tmps=[]
                     for word in value.split(" "):
                         tmps.append(name+" LIKE "+sql_quote("%"+word+"%"))
-                        
+
                     tmp=string.join(tmps,' AND ')
 
                 elif op=="numerical":
@@ -1270,12 +1278,14 @@ class ZSQLExtendFolder(Folder,Persistent
                         tmps.append(name+" LIKE "+sql_quote("%"+word+"%"))
                         
                     tmp=string.join(tmps,' OR ')
-
+                                  
+                searchFieldsOnly[namealt]=value                
                 op="all"
 
 
                 searchTmp="""%s in (select %s from %s where %s)"""%(punktsplit[3],punktsplit[2],punktsplit[0],tmp)
-
+               
+                
                 queryTemplate.append(searchTmp)
                 
             elif (not name[0]==iCT) and (not len(value)==0):
@@ -1333,7 +1343,7 @@ class ZSQLExtendFolder(Folder,Persistent
 
         whereList=["("+searchFields[x]+")" for x in searchFields.keys()]
         whereList+=queryTemplate
-        
+
         if len(whereList)>0:
             if filter:
                 whereStr="("+string.join(whereList," "+lop+" ")+") AND "+filter
@@ -1400,6 +1410,7 @@ class ZSQLExtendFolder(Folder,Persistent
                 self.REQUEST.SESSION[storename]['rangeEnd']=int(rangeStart)+int(limit)
             self.REQUEST.SESSION[storename]['rangeSize']=limit
             self.REQUEST.SESSION[storename]['searchFields']=searchFields
+            print "SF",searchFieldsOnly,searchFields
             self.REQUEST.SESSION[storename]['searchFieldsOnly']=searchFieldsOnly