--- ZSQLExtend/ZSQLExtend.py	2004/07/26 15:43:26	1.28
+++ ZSQLExtend/ZSQLExtend.py	2004/07/28 15:13:00	1.29
@@ -235,7 +235,7 @@ class ZSQLExtendFolder(Folder,Persistent
     
 
         #print "INLINE:",query
-        return self.ZSQLSimpleSearch(var=query)
+        return self.ZSQLSimpleSearch(query)
         
 
     def ZSQLSimpleSearch(self,query=None):
@@ -279,7 +279,7 @@ class ZSQLExtendFolder(Folder,Persistent
         valueString=string.join(valueList,",")
         
         queryString="INSERT INTO %s (%s) VALUES (%s)"%(table,keyString,valueString)
-        self.ZSQLSimpleSearch(var=queryString)
+        self.ZSQLSimpleSearch(queryString)
         return self.REQUEST.RESPONSE.redirect(format)
         
     def ZSQLChange(self,**argv):
@@ -313,7 +313,7 @@ class ZSQLExtendFolder(Folder,Persistent
                 changeList.append("\""+name+"\"="+libpq.PgQuoteString(urllib.unquote(value)))
         changeString=string.join(changeList,",")
         queryString="UPDATE %s SET %s WHERE %s"%(table,changeString,identify)
-        self.ZSQLSimpleSearch(var=queryString)
+        self.ZSQLSimpleSearch(queryString)
         return self.REQUEST.RESPONSE.redirect(format)
 
     def ZSQLChange_old(self):
@@ -338,7 +338,7 @@ class ZSQLExtendFolder(Folder,Persistent
                 changeList.append("\""+name+"\"="+libpq.PgQuoteString(urllib.unquote(value)))
         changeString=string.join(changeList,",")
         queryString="UPDATE %s SET %s WHERE %s"%(table,changeString,identify)
-        self.ZSQLSimpleSearch(var=queryString)
+        self.ZSQLSimpleSearch(queryString)
         return self.REQUEST.RESPONSE.redirect(format)
     
     def ZSQLFind(self,qs="",select="oid,*",storename=None,**argv):
@@ -351,7 +351,8 @@ class ZSQLExtendFolder(Folder,Persistent
                 if (len(splitted)>1) and not (splitted[1]==' '):
                     ret.append(x)
             return ret
-            
+        
+        self.REQUEST.SESSION['come_from_search']="no" # zurücksetzen
         if qs=="":
            if self.REQUEST['QUERY_STRING']:
                qs=self.REQUEST['QUERY_STRING']
@@ -365,7 +366,8 @@ class ZSQLExtendFolder(Folder,Persistent
                #print qs
            else:
                
-               qs=self.REQUEST.SESSION['query']
+               qs=self.REQUEST.SESSION.get('query','')
+               
                for field in argv.keys():
                    #print field
                    qs+=",-%s=%s"%(field,argv[field])
@@ -577,12 +579,12 @@ class ZSQLExtendFolder(Folder,Persistent
                 if not self.REQUEST.SESSION[storename]['queryString2']==query2:
                     #print "HOOOOO",storename
                     self.REQUEST.SESSION[storename]['queryString2']=query2
-                    self.REQUEST.SESSION[storename]['count']=self.ZSQLSimpleSearch(var=query2)[0].count
+                    self.REQUEST.SESSION[storename]['count']=self.ZSQLSimpleSearch(query2)[0].count
                     #print "QUERY",query2,"::::",self.REQUEST.SESSION[storename]['queryString2']
                 
             else:
                 self.REQUEST.SESSION[storename]['queryString2']=query2
-                self.REQUEST.SESSION[storename]['count']=self.ZSQLSimpleSearch(var=query2)[0].count
+                self.REQUEST.SESSION[storename]['count']=self.ZSQLSimpleSearch(query2)[0].count
                 #print "QUERYNEW",self.REQUEST.SESSION[storename]['queryString2']
             
             
@@ -594,12 +596,12 @@ class ZSQLExtendFolder(Folder,Persistent
             self.REQUEST.SESSION[storename]['rangeSize']=limit
             self.REQUEST.SESSION[storename]['searchFields']=searchFields
             
-        #print "Q",query            
+        
         return self.ZSQLQuery(query)
 
     def ZSQLQuery(self,query):
         """query"""
-        return self.ZSQLSimpleSearch(var=query)
+        return self.ZSQLSimpleSearch(query)
     
     def ZSQLSearch(self):
         """To be done"""
@@ -616,6 +618,8 @@ class ZSQLExtendFolder(Folder,Persistent
                 """nothing"""
         #print formatfile        
         self.REQUEST.SESSION['query']=string.join(self.REQUEST['QUERY_STRING'].split("&"),",")
+        self.REQUEST.SESSION['come_from_search']="yes"
+        
         return self.REQUEST.RESPONSE.redirect(urllib.unquote(formatfile))
 
     
@@ -986,7 +990,7 @@ class ZSQLBibliography(Folder,ZSQLExtend
         """index"""
         ret="""<?xml version="1.0" ?>
 	             <index>"""
-        for found in self.ZSQLSimpleSearch(var="select oid from %s limit ALL"%self.tableName):
+        for found in self.ZSQLSimpleSearch("select oid from %s limit ALL"%self.tableName):
             link=self.absolute_url()+"/"+"record.html?oid=%i"%found.oid
             metalink=self.absolute_url()+"/"+"getMetaDataXML?oid=%i"%found.oid