--- ZSQLExtend/ZSQLExtend.py	2006/07/27 17:31:50	1.87
+++ ZSQLExtend/ZSQLExtend.py	2006/08/29 17:44:07	1.90
@@ -369,8 +369,16 @@ class ZSQLExtendFolder(Folder,Persistent
             field=getattr(result,fieldName)
             fieldValue=getattr(result,valueName)
             if fieldValue:
+
                 if not linelen:
-                    ret+="""<option value="%s">%s</option>"""%(field,fieldValue)
+
+                    
+                    if field == selected:
+
+                        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):
@@ -380,7 +388,7 @@ class ZSQLExtendFolder(Folder,Persistent
         return ret
 
             
-    def ZSQLInlineSearchU(self,storename=None,**argv):
+    def ZSQLInlineSearchU(self,storename=None,args=None,**argv):
         """one element if exists"""
         qs=[]
         if storename:
@@ -389,11 +397,15 @@ class ZSQLExtendFolder(Folder,Persistent
         else:
             storename="foundCount"
             
-    
+        if args:
+            argTmp=args
+        else:
+            argTmp=argv
+
 
         #print "INLINE:",argv
-        for a in argv.keys():
-            qs.append(a+"="+urllib.quote(str(argv[a])))
+        for a in argTmp.keys():
+            qs.append(a+"="+urllib.quote(str(argTmp[a])))
         #return []  
         ret = self.parseQueryString(string.join(qs,","),"_",storename=storename)
 
@@ -402,7 +414,7 @@ class ZSQLExtendFolder(Folder,Persistent
         except:
             return None
         
-    def ZSQLInlineSearch(self,storename=None,**argv):
+    def ZSQLInlineSearch(self,storename=None,args=None,**argv):
         """inlinesearch"""
         
         qs=[]
@@ -413,15 +425,22 @@ class ZSQLExtendFolder(Folder,Persistent
             
     
 
+        if args:
+            argTmp=args
+        else:
+            argTmp=argv
+
+
         #print "INLINE:",argv
-        for a in argv.keys():
+        for a in argTmp.keys():
             try:
-                qs.append(a+"="+urllib.quote(str(argv[a])))
+                qs.append(a+"="+urllib.quote(str(argTmp[a])))
             except:
                 import urllib
-                qs.append(a+"="+urllib.quote(str(argv[a])))
+                qs.append(a+"="+urllib.quote(str(argTmp[a])))
                 
         #return []  
+
         return self.parseQueryString(string.join(qs,","),"_",storename=storename)
 
     def ZSQLInlineSearch2(self,query):
@@ -446,6 +465,7 @@ class ZSQLExtendFolder(Folder,Persistent
     def ZSQLSimpleSearch(self,query=None,max_rows=1000000):
         """simple search"""
 
+
         if not query:
             query=self.query
         
@@ -509,9 +529,14 @@ class ZSQLExtendFolder(Folder,Persistent
     
         
         
-    def ZSQLAdd(self,format=None,RESPONSE=None,**argv):
+    def ZSQLAdd(self,format=None,RESPONSE=None,args=None,**argv):
         """Neuer Eintrag"""
             
+	if args:
+            argTmp=args
+        else:
+            argTmp=argv
+
         qs_temp=[]
     
         for a in self.REQUEST.form.keys():
@@ -519,13 +544,13 @@ class ZSQLExtendFolder(Folder,Persistent
 
         qs=string.join(qs_temp,",")
         
-        for field in argv.keys():
+        for field in argTmp.keys():
                    if field[0]=="_":
                        fieldTmp="-"+field[1:]
                    else:
                        fieldTmp=field
                        
-                   qs+=",%s=%s"%(fieldTmp,argv[field])
+                   qs+=",%s=%s"%(fieldTmp,argTmp[field])
         
         
         addList={}
@@ -563,7 +588,7 @@ class ZSQLExtendFolder(Folder,Persistent
         """change entries"""
         #qs=self.REQUEST['QUERY_STRING']
         # very bad hack
-        
+
         qs_temp=[]
         if USE_FORM or RESPONSE:
             for a in self.REQUEST.form.keys():
@@ -1103,6 +1128,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
+
             self.REQUEST.SESSION[storename]['searchFieldsOnly']=searchFieldsOnly
 
         if not NoQuery: