--- ZSQLExtend/ZSQLExtend.py	2006/04/25 17:01:54	1.83
+++ ZSQLExtend/ZSQLExtend.py	2006/05/16 15:56:03	1.85
@@ -729,7 +729,7 @@ class ZSQLExtendFolder(Folder,Persistent
         except:
             return None
         
-    def ZSQLInlineSearch(self,storename=None,**argv):
+    def ZSQLInlineSearch(self,storename=None,args=None,**argv):
         """inlinesearch"""
         
         qs=[]
@@ -739,14 +739,18 @@ class ZSQLExtendFolder(Folder,Persistent
             storename="foundCount"
             
     
-
+        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)
@@ -772,7 +776,7 @@ class ZSQLExtendFolder(Folder,Persistent
 
     def ZSQLSimpleSearch(self,query=None,max_rows=1000000,debug=None):
         """simple search"""
-
+        print query 
 
         if not query:
             query=self.query
@@ -838,7 +842,7 @@ class ZSQLExtendFolder(Folder,Persistent
     
         
         
-    def ZSQLAdd(self,format=None,RESPONSE=None,**argv):
+    def ZSQLAdd(self,format=None,RESPONSE=None,args=None,**argv):
         """Neuer Eintrag"""
             
         qs_temp=[]
@@ -848,13 +852,18 @@ class ZSQLExtendFolder(Folder,Persistent
 
         qs=string.join(qs_temp,",")
         
-        for field in argv.keys():
+        if args:
+            argTmp=args
+        else:
+            argTmp=argv
+            
+        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={}
@@ -888,26 +897,30 @@ class ZSQLExtendFolder(Folder,Persistent
         else:
             return True
         
-    def ZSQLChange(self,format=None,RESPONSE=None,USE_FORM=None,**argv):
+    def ZSQLChange(self,format=None,RESPONSE=None,USE_FORM=None,args=None,**argv):
         """change entries"""
         #qs=self.REQUEST['QUERY_STRING']
         # very bad hack
-        
+        print args
         qs_temp=[]
         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 args:
+            argTmp=args
+        else:    
+            argTmp=argv
+            
+        for field in argTmp.keys():
                 
                    if field[0]=="_":
                        fieldTmp="-"+field[1:]
                    else:
                        fieldTmp=field
                        
-                   qs_temp.append("%s=%s"%(fieldTmp,argv[field]))
+                   qs_temp.append("%s=%s"%(fieldTmp,argTmp[field]))
         
         
         changeList=[]
@@ -1087,7 +1100,7 @@ class ZSQLExtendFolder(Folder,Persistent
         else:
             storename="foundCount"
         
-        return str(min(int(self.REQUEST.SESSION[storename]['rangeEnd']),int(self.REQUEST.SESSION[storename]['count'])))
+        return str(min(int(self.REQUEST.SESSION[storename]['rangeEnd'])+1,int(self.REQUEST.SESSION[storename]['count'])))
 
     def ZSQLNewQuery(self,linkText,storename=None,**argv):
         """suche neu"""