--- ZSQLExtend/ZSQLExtend.py	2004/01/27 13:32:22	1.8
+++ ZSQLExtend/ZSQLExtend.py	2004/02/05 10:29:56	1.9
@@ -17,7 +17,19 @@ def quoteString(name):
 class ZSQLExtendFolder(Persistent, Implicit, Folder):
     """Folder"""
     meta_type="ZSQLExtendFolder"
-    
+
+    def actualPath(self,url=None):
+	"""path"""
+	if not url:
+		return "http://"+self.REQUEST['HTTP_X_FORWARDED_SERVER']+self.REQUEST['PATH_TRANSLATED']
+    	else:
+		temp=self.REQUEST[url].split("/")
+		temp[2]=self.REQUEST['HTTP_X_FORWARDED_SERVER']
+		return string.join(temp,"/")
+
+    def getRequest(self):
+	"""request"""
+	return self.REQUEST
 
     def lowerEnd(self,path):
         """oinly for demo"""
@@ -56,8 +68,7 @@ class ZSQLExtendFolder(Persistent, Impli
         #print "INLINE:",argv
         for a in argv.keys():
             qs.append(a+"="+urllib.quote(str(argv[a])))
-        #return []
-        
+        #return []  
         return self.parseQueryString(string.join(qs,","),"_",storename=storename)
 
     def ZSQLInlineSearch2(self,query):
@@ -251,8 +262,6 @@ class ZSQLExtendFolder(Persistent, Impli
         opfields={}
         skip=""
         rangeStart=0
-        limit="all"
-        max = "LIMIT all"
         
         if not select:
             select="*"
@@ -340,14 +349,13 @@ class ZSQLExtendFolder(Persistent, Impli
             where=""
         #print "QE",table
         
-        query="SELECT oid,%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,max,skip)
         if not nostore=="yes":
             
             self.REQUEST.SESSION['qs']=opfields
         #print "IAMHERE again:", query
 
         if storename:
-            
             query2="SELECT count(*) FROM %s %s"%(table,where)
             #print "storing",query2
             #print "QUERYSTRING:",self.REQUEST.SESSION[storename]['queryString2']
@@ -374,7 +382,7 @@ class ZSQLExtendFolder(Persistent, Impli
                 self.REQUEST.SESSION[storename]['rangeEnd']=int(rangeStart)+int(limit)
             self.REQUEST.SESSION[storename]['rangeSize']=limit
             
-	#print "HELLO",query            
+	#print query            
         return self.search(var=query)
     
     def ZSQLSearch(self):
@@ -447,7 +455,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"):
@@ -498,7 +507,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"""
@@ -525,7 +537,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"""
@@ -555,7 +567,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())