--- ZSQLExtend/ZSQLExtend.py	2004/01/22 09:18:49	1.6
+++ ZSQLExtend/ZSQLExtend.py	2004/02/09 14:22:30	1.11
@@ -17,7 +17,24 @@ def quoteString(name):
 class ZSQLExtendFolder(Persistent, Implicit, Folder):
     """Folder"""
     meta_type="ZSQLExtendFolder"
-    
+
+    def actualPath(self,url=None):
+	"""path"""
+
+        if self.REQUEST['HTTP_X_FORWARDED_SERVER']=='':
+            host=self.REQUEST['HTTP_HOST']
+        else:
+            host=self.REQUEST['HTTP_X_FORWARDED_SERVER']
+	if not url:
+		return "http://"+host+self.REQUEST['PATH_TRANSLATED']
+    	else:
+		temp=self.REQUEST[url].split("/")
+		temp[2]=host
+		return string.join(temp,"/")
+
+    def getRequest(self):
+	"""request"""
+	return self.REQUEST
 
     def lowerEnd(self,path):
         """oinly for demo"""
@@ -25,7 +42,7 @@ class ZSQLExtendFolder(Persistent, Impli
         
     def ZSQLisEmpty(self,field):
         """Teste ob Treffer leer"""
-        print "field",field
+        #print "field",field
         if not field:
             return 1
         if field=="":
@@ -38,7 +55,7 @@ class ZSQLExtendFolder(Persistent, Impli
         ret="""<select name="-op_%s">
 	<option value="bw">begins with</option>          	<!-- begins with / beginnt mit, "Wort*" -->
 	<option value="ew">ends with</option>
-   	<option value="ct">contains</option>          		<!-- contains / enthaellt, "Wort" -->
+   	<option value="ct" selected>contains</option>          		<!-- contains / enthaellt, "Wort" -->
     <option value="eq">equals</option>          		<!-- equals / ist, =Wort -->
 </select>"""%fieldname
         return ret
@@ -157,7 +174,7 @@ class ZSQLExtendFolder(Persistent, Impli
         self.search(var=queryString)
         return self.REQUEST.RESPONSE.redirect(format)
     
-    def ZSQLFind(self,qs="",select="*",storename=None):
+    def ZSQLFind(self,qs="",select="oid,*",storename=None):
         """Find"""
 
 
@@ -244,15 +261,18 @@ 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="*"
+            select="oid,*"
         #print "Q",nostore,qs
         #check for op in the case of inline search
         
@@ -288,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)
@@ -310,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:
@@ -337,14 +360,14 @@ 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
-        print "IAMHERE again:", query
+        #print "IAMHERE again:", query
 
         if storename:
-            query2="SELECT count(%s) FROM %s %s"%(select,table,where)
+            query2="SELECT count(*) FROM %s %s"%(table,where)
             #print "storing",query2
             #print "QUERYSTRING:",self.REQUEST.SESSION[storename]['queryString2']
             if not self.REQUEST.SESSION.has_key(storename):
@@ -369,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            
+	#print query            
         return self.search(var=query)
+
     
     def ZSQLSearch(self):
         """To be done"""
@@ -398,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:
@@ -443,7 +479,8 @@ class ZSQLExtendFolder(Persistent, Impli
             newquery.append(query)
                 
         newquerystring=string.join(newquery,"&")
-        return "<a href='%s'>%s</a>"%(self.REQUEST['URL0']+"?"+newquerystring,html)
+	
+        return "<a href='%s'>%s</a>"%(self.actualPath()+"?"+newquerystring,html)
             
         
     def prevLink(self,html,storename="foundCount"):
@@ -494,7 +531,10 @@ class ZSQLExtendFolder(Persistent, Impli
             newquery.append(query)
             
         newquerystring=string.join(newquery,"&")
-        return "<a href='%s'>%s</a>"%(self.REQUEST['URL0']+"?"+newquerystring,html)
+
+        return "<a href='%s'>%s</a>"%(self.actualPath()+"?"+newquerystring,html)
+
+
     
     def prevLink_old(self,html):
         """prev link"""
@@ -521,7 +561,7 @@ class ZSQLExtendFolder(Persistent, Impli
         else:
             queries.append("-offset=%i"%offsetnew)
             newquerystring=string.join(queries,"&")
-        return "<a href='%s'>%s</a>"%(self.REQUEST['URL0']+"?"+newquerystring,html)
+        return "<a href='%s'>%s</a>"%(self.actualPath()+"?"+newquerystring,html)
         
     def nextLink_old(self,html):
         """prev link"""
@@ -551,7 +591,7 @@ class ZSQLExtendFolder(Persistent, Impli
             queries.append("-offset=%i"%offsetnew)
             newquerystring=string.join(queries,"&")
         
-        return "<a href='%s'>%s</a>"%(self.REQUEST['URL0']+"?"+newquerystring,html)
+        return "<a href='%s'>%s</a>"%(self.actualPath()+"?"+newquerystring,html)
         
     
 manage_addZSQLExtendFolderForm=DTMLFile('ZSQLExtendFolderAdd', globals())