--- ZSQLExtend/ZSQLExtend.py	2004/02/05 20:31:42	1.10
+++ ZSQLExtend/ZSQLExtend.py	2004/03/10 15:06:53	1.13
@@ -18,6 +18,22 @@ class ZSQLExtendFolder(Persistent, Impli
     """Folder"""
     meta_type="ZSQLExtendFolder"
 
+    def getSAttribute(self,obj,atribute,pref=''):
+        """get Attribute or emptystring"""
+        
+        #print "obj",obj
+        try:
+            return pref+getattr(obj,atribute)
+        except:
+            return ""
+        
+    def getS(self,str):
+        """make none to empty string"""
+        if str:
+            return str
+        else:
+            return ""
+
     def actualPath(self,url=None):
 	"""path"""
 
@@ -188,16 +204,17 @@ class ZSQLExtendFolder(Persistent, Impli
                
                qs=self.REQUEST.SESSION['query']
         else:
+            self.REQUEST['QUERY_STRING']=qs
             qs=string.join(qs.split("&"),",")
-	
+            
 
         qs=re.sub("\\+"," ",qs)# Austauschen da Leerzeichen bei http-get durch + ersetzt wird, generell sollte alles auf post umgeschrieben werden. vom search formular.
-        #print "QS",qs
+
         if storename:
             """store"""
         else:
             storename="foundCount"
-        
+        #print "QS",qs
         ret=self.parseQueryString(qs,"-",select=select,storemax="yes",storename=storename)
         #print self.REQUEST.SESSION["foundCount"]
         
@@ -261,12 +278,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,*"
@@ -279,7 +299,7 @@ class ZSQLExtendFolder(Persistent, Impli
         for q in splitted:
                 
                 name=re.sub("r'+'"," ",q.split("=")[0].lower())
-                value=urllib.unquote(q.split("=")[1])
+                value=urllib.unquote(q.split("=",1)[1])
 
                 if name[0:3]==iCT+"op":
                     op=value
@@ -294,7 +314,7 @@ class ZSQLExtendFolder(Persistent, Impli
             #try:
 
             name=re.sub("r'+'"," ",q.split("=")[0].lower())
-            value=urllib.unquote(q.split("=")[1])
+            value=urllib.unquote(q.split("=",1)[1])
             #value=libpq.PgQuoteString(value)
             
             
@@ -305,7 +325,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 +347,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 +377,8 @@ 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 +410,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            
+	#print "Q",query            
         return self.search(var=query)
+
     
     def ZSQLSearch(self):
         """To be done"""
@@ -415,6 +441,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: