--- ZSQLExtend/ZSQLExtend.py 2004/01/22 09:18:49 1.6
+++ ZSQLExtend/ZSQLExtend.py 2004/02/05 20:31:42 1.10
@@ -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=""""""%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"""
@@ -252,7 +269,7 @@ class ZSQLExtendFolder(Persistent, Impli
rangeStart=0
if not select:
- select="*"
+ select="oid,*"
#print "Q",nostore,qs
#check for op in the case of inline search
@@ -341,10 +358,10 @@ class ZSQLExtendFolder(Persistent, Impli
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):
@@ -370,7 +387,7 @@ class ZSQLExtendFolder(Persistent, Impli
self.REQUEST.SESSION[storename]['rangeEnd']=int(rangeStart)+int(limit)
self.REQUEST.SESSION[storename]['rangeSize']=limit
- print query
+ #print query
return self.search(var=query)
def ZSQLSearch(self):
@@ -443,7 +460,8 @@ class ZSQLExtendFolder(Persistent, Impli
newquery.append(query)
newquerystring=string.join(newquery,"&")
- return "%s"%(self.REQUEST['URL0']+"?"+newquerystring,html)
+
+ return "%s"%(self.actualPath()+"?"+newquerystring,html)
def prevLink(self,html,storename="foundCount"):
@@ -494,7 +512,10 @@ class ZSQLExtendFolder(Persistent, Impli
newquery.append(query)
newquerystring=string.join(newquery,"&")
- return "%s"%(self.REQUEST['URL0']+"?"+newquerystring,html)
+
+ return "%s"%(self.actualPath()+"?"+newquerystring,html)
+
+
def prevLink_old(self,html):
"""prev link"""
@@ -521,7 +542,7 @@ class ZSQLExtendFolder(Persistent, Impli
else:
queries.append("-offset=%i"%offsetnew)
newquerystring=string.join(queries,"&")
- return "%s"%(self.REQUEST['URL0']+"?"+newquerystring,html)
+ return "%s"%(self.actualPath()+"?"+newquerystring,html)
def nextLink_old(self,html):
"""prev link"""
@@ -551,7 +572,7 @@ class ZSQLExtendFolder(Persistent, Impli
queries.append("-offset=%i"%offsetnew)
newquerystring=string.join(queries,"&")
- return "%s"%(self.REQUEST['URL0']+"?"+newquerystring,html)
+ return "%s"%(self.actualPath()+"?"+newquerystring,html)
manage_addZSQLExtendFolderForm=DTMLFile('ZSQLExtendFolderAdd', globals())