--- ZSQLExtend/ZSQLExtend.py	2004/02/05 20:31:42	1.10
+++ ZSQLExtend/ZSQLExtend.py	2004/02/09 14:22:30	1.11
@@ -261,12 +261,15 @@ class ZSQLExtendFolder(Persistent, Impli
         #print "NO",nostore
         lop="AND" # standardsuche mit and
         max="ALL" #standard alle auswählen
+        maxstr=""
         whereList=[]
         sort=""
         op="bw"
         opfields={}
         skip=""
         rangeStart=0
+        limit=0
+        searchFields={}
         
         if not select:
             select="oid,*"
@@ -305,7 +308,7 @@ class ZSQLExtendFolder(Persistent, Impli
             elif name==iCT+"select":
                 select=value
             elif name==iCT+"max":
-                max="LIMIT "+str(value)
+                maxstr="LIMIT "+str(value)
                 limit=str(value)
             elif name==iCT+"skip":
                 skip="OFFSET "+str(value)
@@ -327,6 +330,9 @@ class ZSQLExtendFolder(Persistent, Impli
                 
 		#print "OP",op,name
                 value=value.lower()
+
+                searchFields[name]=value
+                
                 if opfields.has_key(name):
                     op=opfields[name]
 		else:
@@ -354,7 +360,7 @@ class ZSQLExtendFolder(Persistent, Impli
             where=""
         #print "QE",table
         
-        query="SELECT %s FROM %s %s %s %s %s"%(select,table,where,sort,max,skip)
+        query="SELECT %s FROM %s %s %s %s %s"%(select,table,where,sort,maxstr,skip)
         if not nostore=="yes":
             
             self.REQUEST.SESSION['qs']=opfields
@@ -386,9 +392,11 @@ class ZSQLExtendFolder(Persistent, Impli
             else:
                 self.REQUEST.SESSION[storename]['rangeEnd']=int(rangeStart)+int(limit)
             self.REQUEST.SESSION[storename]['rangeSize']=limit
+            self.REQUEST.SESSION[storename]['searchFields']=searchFields
             
 	#print query            
         return self.search(var=query)
+
     
     def ZSQLSearch(self):
         """To be done"""
@@ -415,6 +423,17 @@ class ZSQLExtendFolder(Persistent, Impli
         except:
             return 0
 
+    def getZSQLSearchFieldsList(self,storename="foundCount"):
+        """get searchfieldList"""
+        print self.REQUEST.SESSION[storename]['searchFields'].keys()
+        return  self.REQUEST.SESSION[storename]['searchFields'].keys()
+
+    def getZSQLSearchFields(self,storename="foundCount"):
+        """get searchfield"""
+        print "SF",self.REQUEST.SESSION[storename]['searchFields']
+        return  self.REQUEST.SESSION[storename]['searchFields']
+
+                                                
     def nextLink(self,html,storename="foundCount"):
         """nextLink"""
         try: