--- ZSQLExtend/ZSQLExtend.py	2004/08/04 11:02:39	1.30
+++ ZSQLExtend/ZSQLExtend.py	2004/08/18 14:47:58	1.31
@@ -352,7 +352,7 @@ class ZSQLExtendFolder(Folder,Persistent
                     ret.append(x)
             return ret
         
-        self.REQUEST.SESSION['come_from_search']="no" # zurücksetzen
+        #self.REQUEST.SESSION['come_from_search']="no" # zurücksetzen
         if qs=="":
            if self.REQUEST['QUERY_STRING']:
                qs=self.REQUEST['QUERY_STRING']
@@ -464,7 +464,7 @@ class ZSQLExtendFolder(Folder,Persistent
         rangeStart=0
         limit=0
         searchFields={}
-        
+        searchFieldsOnly={}
         if not select:
             select="oid,*"
         #print "Q",nostore,qs
@@ -560,8 +560,10 @@ class ZSQLExtendFolder(Folder,Persistent
                     
                 if searchFields.has_key(name):
                     searchFields[name]+=lopfields.get(name,'OR')+" "+tmp
-                else:
+                    searchFieldsOnly[name]+=lopfields.get(name,'OR')+" "+value
+                else: 
                     searchFields[name]=tmp
+                    searchFieldsOnly[name]=value
 
             
        ##  for name in searchFields.keys():
@@ -631,6 +633,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
             
 
         return self.ZSQLQuery(query)
@@ -670,12 +673,13 @@ class ZSQLExtendFolder(Folder,Persistent
     def getZSQLSearchFieldsList(self,storename="foundCount"):
         """get searchfieldList"""
         #print self.REQUEST.SESSION[storename]['searchFields'].keys()
-        return  self.REQUEST.SESSION[storename]['searchFields'].keys()
+        return  self.REQUEST.SESSION[storename]['searchFieldsOnly'].keys()
 
-    def getZSQLSearchFields(self,storename="foundCount"):
+    def getZSQLSearchFields(self,field,storename="foundCount"):
         """get searchfield"""
         #print "SF",self.REQUEST.SESSION[storename]['searchFields']
-        return  self.REQUEST.SESSION[storename]['searchFields']
+        
+        return  self.REQUEST.SESSION[storename]['searchFieldsOnly'][field]
 
                                                 
     def nextLink(self,html,storename="foundCount"):