--- ZSQLExtend/ZSQLExtend.py 2004/01/27 13:32:22 1.8
+++ ZSQLExtend/ZSQLExtend.py 2004/03/11 14:50:47 1.14
@@ -17,7 +17,58 @@ def quoteString(name):
class ZSQLExtendFolder(Persistent, Implicit, Folder):
"""Folder"""
meta_type="ZSQLExtendFolder"
-
+
+ def formatAscii(self,str,url=None):
+ """ersetze ascii umbrueche durch
"""
+ #url=None
+ if url:
+
+ retStr=""
+ words=str.split("\n")
+
+ for word in words:
+ strUrl=url%word
+ #print "str",strUrl
+ retStr+="""%s
"""%(strUrl,word)
+ str=retStr
+ if str:
+ return re.sub(r"[\n]","
",str)
+ else:
+ return ""
+
+ 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"""
+
+ 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"""
@@ -56,8 +107,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):
@@ -158,7 +208,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"""
@@ -172,16 +222,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"]
@@ -245,17 +296,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="all"
- max = "LIMIT all"
+ limit=0
+ searchFields={}
if not select:
- select="*"
+ select="oid,*"
#print "Q",nostore,qs
#check for op in the case of inline search
@@ -265,13 +317,16 @@ class ZSQLExtendFolder(Persistent, Impli
for q in splitted:
name=re.sub("r'+'"," ",q.split("=")[0].lower())
- value=urllib.unquote(q.split("=")[1])
-
+ try:
+ value=urllib.unquote(q.split("=",1)[1])
+ except:
+ value=""
if name[0:3]==iCT+"op":
op=value
+
field=name[4:]
opfields[field]=op
-
+ #print "HI",op,field
#print opfieldsa
#now analyse the querystring
for q in qs.split(","):
@@ -280,7 +335,11 @@ class ZSQLExtendFolder(Persistent, Impli
#try:
name=re.sub("r'+'"," ",q.split("=")[0].lower())
- value=urllib.unquote(q.split("=")[1])
+ try:
+ value=urllib.unquote(q.split("=",1)[1])
+ except:
+ value=""
+
#value=libpq.PgQuoteString(value)
@@ -291,7 +350,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)
@@ -313,6 +372,9 @@ class ZSQLExtendFolder(Persistent, Impli
#print "OP",op,name
value=value.lower()
+
+ searchFields[name]=value
+
if opfields.has_key(name):
op=opfields[name]
else:
@@ -340,14 +402,14 @@ 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,maxstr,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']
@@ -373,9 +435,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 "HELLO",query
+ #print "Q",query
return self.search(var=query)
+
def ZSQLSearch(self):
"""To be done"""
@@ -402,6 +466,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:
@@ -447,7 +522,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"):
@@ -498,7 +574,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"""
@@ -525,7 +604,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"""
@@ -555,7 +634,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())