--- ZSQLExtend/ZSQLExtend.py 2004/08/18 14:47:58 1.31
+++ ZSQLExtend/ZSQLExtend.py 2004/10/22 13:32:24 1.44
@@ -5,7 +5,7 @@ from Globals import DTMLFile
import urllib
import re
import string
-from pyPgSQL import libpq
+#from pyPgSQL import libpq
from AccessControl import getSecurityManager
import os.path
from Products.PageTemplates.PageTemplateFile import PageTemplateFile
@@ -13,6 +13,32 @@ from Products.PageTemplates.PageTemplate
from Products.ZSQLMethods.SQL import SQLConnectionIDs
import Shared.DC.ZRDB.DA
+def analyseIntSearch(word):
+ #analyse integer searches
+
+ splitted=word.split("-")
+
+ if len(splitted)==1:
+ return "="+splitted[0]
+
+ if splitted[0]=="":
+ return "< "+splitted[1]
+
+ if splitted[1]=='':
+ return "> "+splitted[0]
+ else:
+ return "BETWEEN "+splitted[0]+" AND "+splitted[1]
+
+
+
+def sql_quote(v):
+ # quote dictionary
+ quote_dict = {"\'": "''", "\\": "\\\\"}
+ for dkey in quote_dict.keys():
+ if string.find(v, dkey) >= 0:
+ v=join(split(v,dkey),quote_dict[dkey])
+ return "'%s'" % v
+
def showSQLConnectionIDs(self):
return SQLConnectionIDs(self)
@@ -20,6 +46,24 @@ class ZSQLExtendFolder(Folder,Persistent
"""Folder"""
meta_type="ZSQLExtendFolder"
+ def testneu(self):
+ """test"""
+ relStatement="""period like '%s%%'"""
+ statement="select * from cdli_cat"
+ wherePart="museum_no like 'VAT%'"
+ classes=['Uruk III','Uruk IV']
+ return self.searchRel(relStatement,statement,wherePart,classes)
+
+ def searchRel(self,relStatement,statement,wherePart,classes):
+ """suche relative haufigkeiten"""
+ ret={}
+ allRecords=len(self.ZSQLSimpleSearch(statement + " where "+wherePart))
+
+ for oneclass in classes:
+ ret[oneclass]=len(self.ZSQLSimpleSearch(statement + " where ("+wherePart+") and "+ relStatement%oneclass))
+
+ return (ret,allRecords)
+
def content_html(self):
"""template fuer content"""
@@ -172,8 +216,8 @@ class ZSQLExtendFolder(Folder,Persistent
ret+=""""""
return ret
- def ZSQLOptionsFromSearchList(self,fieldname,results,fieldName,valueName=None,start=None, multiple=''):
- """generate select oprions form a cr seperated list"""
+ def ZSQLOptionsFromSearchList(self,fieldname,results,fieldName,valueName=None,start=None, multiple='',startValue=None):
+ """generate select oprions form a search list seperated list"""
if not valueName:
valueName=fieldName
@@ -182,7 +226,10 @@ class ZSQLExtendFolder(Folder,Persistent
if start:
if start==' ':
start=''
- ret+=""""""%(start,start)
+ if not startValue:
+ startValue=start
+
+ ret+=""""""%(startValue,start)
for result in results:
field=getattr(result,fieldName)
fieldValue=getattr(result,valueName)
@@ -214,6 +261,7 @@ class ZSQLExtendFolder(Folder,Persistent
def ZSQLInlineSearch(self,storename=None,**argv):
"""inlinesearch"""
+
qs=[]
if storename:
"""store"""
@@ -224,7 +272,12 @@ class ZSQLExtendFolder(Folder,Persistent
#print "INLINE:",argv
for a in argv.keys():
- qs.append(a+"="+urllib.quote(str(argv[a])))
+ try:
+ qs.append(a+"="+urllib.quote(str(argv[a])))
+ except:
+ import urllib
+ qs.append(a+"="+urllib.quote(str(argv[a])))
+
#return []
return self.parseQueryString(string.join(qs,","),"_",storename=storename)
@@ -233,23 +286,34 @@ class ZSQLExtendFolder(Folder,Persistent
qs=[]
-
+
#print "INLINE:",query
return self.ZSQLSimpleSearch(query)
def ZSQLSimpleSearch(self,query=None):
""" returrn SQLSearch"""
+ #print "hi",query
if not query:
query=self.query
-
- if self.search.meta_type=="Z SQL Method":
+ if getattr(self,'_v_search',None):
+
+ return self._v_search(var=query)
+
+ if hasattr(self,'search') and (self.search.meta_type=="Z SQL Method"):
+ self._v_search=self.search
return self.search(var=query)
else:
- if self.aq_parent.aq_parent.search.meta_type=="Z SQL Method":
+ if hasattr(self.aq_parent.aq_parent,'search') and (self.aq_parent.aq_parent.search.meta_type=="Z SQL Method"):
+ self._v_search=self.aq_parent.aq_parent.search
return self.aq_parent.aq_parent.search(var=query)
else:
- return []
+ search=self.ZopeFind(self,obj_metatypes=["Z SQL Method"],search_sub=1)
+ if search:
+ self._v_search=search[0][1]
+ return search[0][1](var=query)
+ else:
+ return []
@@ -273,7 +337,7 @@ class ZSQLExtendFolder(Folder,Persistent
valueList=[]
for x in addList.keys():
keyList.append("\""+x+"\"")
- valueList.append(libpq.PgQuoteString(addList[x]))
+ valueList.append(sql_quote(addList[x]))
keyString=string.join(keyList,",")
valueString=string.join(valueList,",")
@@ -283,7 +347,7 @@ class ZSQLExtendFolder(Folder,Persistent
return self.REQUEST.RESPONSE.redirect(format)
def ZSQLChange(self,**argv):
- """Ändern von Einträgen"""
+ """change entries"""
#qs=self.REQUEST['QUERY_STRING']
# very bad hack
qs_temp=[]
@@ -306,18 +370,18 @@ class ZSQLExtendFolder(Folder,Persistent
table=urllib.unquote(value)
elif name=="-identify":
identify=urllib.unquote(value)
- identify=identify.split("=")[0]+"="+libpq.PgQuoteString(identify.split("=")[1])
+ identify=identify.split("=")[0]+"="+sql_quote(identify.split("=")[1])
elif name=="-format":
format=urllib.unquote(value)
elif (not name[0]=="-") and (not len(value)==0):
- changeList.append("\""+name+"\"="+libpq.PgQuoteString(urllib.unquote(value)))
+ changeList.append("\""+name+"\"="+sql_quote(urllib.unquote(value)))
changeString=string.join(changeList,",")
queryString="UPDATE %s SET %s WHERE %s"%(table,changeString,identify)
self.ZSQLSimpleSearch(queryString)
return self.REQUEST.RESPONSE.redirect(format)
def ZSQLChange_old(self):
- """Ändern von Einträgen"""
+ """change entries"""
qs=self.REQUEST['QUERY_STRING']
#print "CHANGE QS",self.REQUEST
#return self.REQUEST
@@ -331,17 +395,33 @@ class ZSQLExtendFolder(Folder,Persistent
table=urllib.unquote(value)
elif name=="-identify":
identify=urllib.unquote(value)
- identify=identify.split("=")[0]+"="+libpq.PgQuoteString(identify.split("=")[1])
+ identify=identify.split("=")[0]+"="+sql_quote(identify.split("=")[1])
elif name=="-format":
format=urllib.unquote(value)
elif (not name[0]=="-") and (not len(value)==0):
- changeList.append("\""+name+"\"="+libpq.PgQuoteString(urllib.unquote(value)))
+ changeList.append("\""+name+"\"="+sql_quote(urllib.unquote(value)))
changeString=string.join(changeList,",")
queryString="UPDATE %s SET %s WHERE %s"%(table,changeString,identify)
self.ZSQLSimpleSearch(queryString)
return self.REQUEST.RESPONSE.redirect(format)
+
+
+
+ def ZSQLFind2(self,qs="",select="oid,*",storename=None,tableList=['cdli_translit','cdli_cat'],**argv):
+ """find2"""
+ #search1= self.ZSQLFind(qs="",select="oid,*",storename=None,tableExt='cdli_translit',restrictField='id_text',NoQuery='yes',NoLimit='yes',**argv)
+
+
+ #search2 = self.ZSQLFind(tableExt='cdli_cat',qs="",select="oid,*",storename=None,restrictConnect=('cdli_cat.id_text',search1),**argv)
+
+ search1= self.ZSQLFind(qs="",select="oid,*",storename=None,tableExt='cdli_cat',restrictField='id_text',NoQuery='yes',NoLimit='yes',**argv)
+
+ search2 = self.ZSQLFind(tableExt='cdli_translit',qs="",select="oid,*",storename=None,restrictConnect=('cdli_translit.id_text',search1),**argv)
+ return search2
+
+ #return self.ZSQLFind(qs="",select="oid,*",storename=None,tableExt=None,NoQuery=None,**argv)
- def ZSQLFind(self,qs="",select="oid,*",storename=None,**argv):
+ def ZSQLFind(self,qs="",select="oid,*",storename=None,tableExt=None,NoQuery=None,NoLimit=None,restrictField=None,restrictConnect=None,filter=None,**argv):
"""Find"""
def delEmpty(list):
@@ -352,11 +432,12 @@ class ZSQLExtendFolder(Folder,Persistent
ret.append(x)
return ret
- #self.REQUEST.SESSION['come_from_search']="no" # zurücksetzen
+ #self.REQUEST.SESSION['come_from_search']="no" # zuruecksetzen
if qs=="":
+
if self.REQUEST['QUERY_STRING']:
qs=self.REQUEST['QUERY_STRING']
-
+
qs=string.join(qs.split("&"),",")
@@ -389,11 +470,11 @@ class ZSQLExtendFolder(Folder,Persistent
storename="foundCount"
-
- ret=self.parseQueryString(qs,"-",select=select,storemax="yes",storename=storename)
+ #print "calling Query with",repr(NoQuery)
+ ret=self.parseQueryString(qs,"-",select=select,storemax="yes",storename=storename,tableExt=tableExt,NoQuery=NoQuery,NoLimit=NoLimit,restrictField=restrictField,restrictConnect=restrictConnect,filter=filter)
#print self.REQUEST.SESSION["foundCount"]
-
+
return ret
def ZSQLFoundCountLen(self,var):
@@ -449,7 +530,7 @@ class ZSQLExtendFolder(Folder,Persistent
return str(min(int(self.REQUEST.SESSION[storename]['rangeEnd']),int(self.REQUEST.SESSION[storename]['count'])))
- def parseQueryString(self,qs,iCT,storemax="no",select=None,nostore=None,storename=None):
+ def parseQueryString(self,qs,iCT,storemax="no",select=None,nostore=None,storename=None,tableExt=None,NoQuery=None,NoLimit=None,restrictField=None,restrictConnect=None,filter=None):
"""analysieren den QueryString"""
#print "NO",nostore
lop="AND" # standardsuche mit and
@@ -460,6 +541,8 @@ class ZSQLExtendFolder(Folder,Persistent
op="bw"
opfields={}
lopfields={} #Verknüpfung bei mehrfachauswahl von einem feld
+ sortfields={} #order of sortfields
+ sortAllFields=None
skip=""
rangeStart=0
limit=0
@@ -471,7 +554,11 @@ class ZSQLExtendFolder(Folder,Persistent
#check for op
splitted=qs.split(",")
-
+ if tableExt:
+ table=tableExt
+
+ if restrictField:
+ select=restrictField
for q in splitted:
@@ -492,6 +579,18 @@ class ZSQLExtendFolder(Folder,Persistent
field=name[5:]
lopfields[field]=lop
+
+ if name[0:10]==iCT+"sortorder":
+ #sort=value
+
+ field=name[11:]
+ sortAllFields=None
+ #no field selected
+ if field=="":
+ sortAllFields=value
+ else:
+ sortfields[field]=value
+
#print "HI",op,field
#print opfieldsa
#now analyse the querystring
@@ -506,25 +605,41 @@ class ZSQLExtendFolder(Folder,Persistent
except:
value=""
- #value=libpq.PgQuoteString(value)
+ #value=sql_quote(value)
if name==iCT+"lop":
lop=value
elif name==iCT+"table":
- table=value
+ if not tableExt:
+ table=value
elif name==iCT+"select":
- select=value
+ if not restrictField:
+ select=value
elif name==iCT+"max":
- maxstr="LIMIT "+str(value)
- limit=str(value)
+ if not NoLimit:
+ maxstr="LIMIT "+str(value)
+ limit=str(value)
elif name==iCT+"skip":
skip="OFFSET "+str(value)
rangeStart=str(value)
elif name==iCT+"join":
whereList.append(value)
elif name==iCT+"sort":
- sort="ORDER BY "+value.replace(' AND ',',')
+ sortstrs=[]
+ for word in value.split(','):
+ wordstr=word.lstrip().rstrip()
+ if sortAllFields:
+ order=sortAllFields
+ else:
+ order=sortfields.get(wordstr,'ASC')
+
+ if not (wordstr == ""):
+ sortstrs.append(wordstr+" "+order)
+ if len(sortstrs)>0:
+ sort="ORDER BY "+string.join(sortstrs,',')
+
+
elif name==iCT+"token":
if not nostore=="yes":
self.REQUEST.SESSION['token']=value
@@ -543,62 +658,72 @@ class ZSQLExtendFolder(Folder,Persistent
op=opfields[name]
else:
op="ct"
+ namealt=name
name="LOWER("+name+")"
if op=="ct":
- tmp=(name+" LIKE "+libpq.PgQuoteString("%"+value+"%"))
+ tmp=(name+" LIKE "+sql_quote("%"+value+"%"))
elif op=="gt":
- tmp=(name+">"+libpq.PgQuoteString(value))
+ tmp=(name+">"+sql_quote(value))
elif op=="lt":
- tmp=(name+"<"+libpq.PgQuoteString(value))
+ tmp=(name+"<"+sql_quote(value))
elif op=="eq":
- tmp=(name+"="+libpq.PgQuoteString(value))
+ tmp=(name+"="+sql_quote(value))
elif op=="bw":
- tmp=(name+" LIKE "+libpq.PgQuoteString(value+"%"))
+ tmp=(name+" LIKE "+sql_quote(value+"%"))
elif op=="ew":
- tmp=(name+" LIKE "+libpq.PgQuoteString("%"+value))
+ tmp=(name+" LIKE "+sql_quote("%"+value))
+ elif op=="all":
+ tmps=[]
+ for word in value.split(" "):
+ tmps.append(name+" LIKE "+sql_quote("%"+word+"%"))
+
+ tmp=string.join(tmps,' AND ')
+
+ elif op=="numerical":
+ term=analyseIntSearch(value)
+ tmp=(name+" "+term)
+ elif op=="grep":
+ tmp=(name+" ~* "+sql_quote(value))
+ elif op=="one":
+ tmps=[]
+ for word in value.split(" "):
+ tmps.append(name+" LIKE "+sql_quote("%"+word+"%"))
+
+ tmp=string.join(tmps,' OR ')
+
op="ct"
-
- if searchFields.has_key(name):
- searchFields[name]+=lopfields.get(name,'OR')+" "+tmp
- searchFieldsOnly[name]+=lopfields.get(name,'OR')+" "+value
- else:
- searchFields[name]=tmp
- searchFieldsOnly[name]=value
-
- ## for name in searchFields.keys():
-## value=searchFields[name]
-
-## if opfields.has_key(name):
-## op=opfields[name]
-## else:
-## op="ct"
-## name="LOWER("+name+")"
-## if op=="ct":
-## whereList.append(name+" LIKE "+libpq.PgQuoteString("%"+value+"%"))
-## elif op=="gt":
-## whereList.append(name+">"+libpq.PgQuoteString(value))
-## elif op=="lt":
-## whereList.append(name+"<"+libpq.PgQuoteString(value))
-## elif op=="eq":
-## whereList.append(name+"="+libpq.PgQuoteString(value))
-## elif op=="bw":
-## whereList.append(name+" LIKE "+libpq.PgQuoteString(value+"%"))
-## elif op=="ew":
-## whereList.append(name+" LIKE "+libpq.PgQuoteString("%"+value))
-## op="ct"
-
-## #except:
-## # print "END",value,name,Exception
+ if (not tableExt) or (namealt.split('.')[0]==tableExt):
+ if searchFields.has_key(name):
+ searchFields[name]+=lopfields.get(name,'OR')+" "+tmp
+ searchFieldsOnly[name]+=lopfields.get(name,'OR')+" "+value
+ else:
+ searchFields[name]=tmp
+ searchFieldsOnly[name]=value
whereList=["("+searchFields[x]+")" for x in searchFields.keys()]
if len(whereList)>0:
- where="WHERE "+string.join(whereList," "+lop+" ")
+ if filter:
+ whereStr="("+string.join(whereList," "+lop+" ")+") AND "+filter
+ else:
+ whereStr=string.join(whereList," "+lop+" ")
+ where="WHERE "+whereStr
else:
- where=""
+ if filter:
+ where="WHERE "+filter
+ else:
+ where=""
+
+ if restrictConnect:
+
+ if len(where)==0:
+ where="WHERE "+restrictConnect[0]+" in ("+restrictConnect[1]+")"
+ else:
+ where+="and "+restrictConnect[0]+" in ("+restrictConnect[1]+")"
+
#print "QE",table
-
+ #print (select,table,where,sort,maxstr,skip)
query="SELECT %s FROM %s %s %s %s %s"%(select,table,where,sort,maxstr,skip)
if not nostore=="yes":
@@ -606,21 +731,23 @@ class ZSQLExtendFolder(Folder,Persistent
self.REQUEST.SESSION['qs']=opfields
#print "IAMHERE again:", query
- if storename:
+ if storename and (not NoQuery):
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):
self.REQUEST.SESSION[storename]={}
if self.REQUEST.SESSION[storename].has_key('queryString2'):
- #print "HI",storename
+
if not self.REQUEST.SESSION[storename]['queryString2']==query2:
#print "HOOOOO",storename
self.REQUEST.SESSION[storename]['queryString2']=query2
self.REQUEST.SESSION[storename]['count']=self.ZSQLSimpleSearch(query2)[0].count
+
#print "QUERY",query2,"::::",self.REQUEST.SESSION[storename]['queryString2']
else:
+
self.REQUEST.SESSION[storename]['queryString2']=query2
self.REQUEST.SESSION[storename]['count']=self.ZSQLSimpleSearch(query2)[0].count
#print "QUERYNEW",self.REQUEST.SESSION[storename]['queryString2']
@@ -634,12 +761,17 @@ class ZSQLExtendFolder(Folder,Persistent
self.REQUEST.SESSION[storename]['rangeSize']=limit
self.REQUEST.SESSION[storename]['searchFields']=searchFields
self.REQUEST.SESSION[storename]['searchFieldsOnly']=searchFieldsOnly
-
- return self.ZSQLQuery(query)
+ if not NoQuery:
+ return self.ZSQLQuery(query)
+ else:
+
+ return query
+
def ZSQLQuery(self,query):
"""query"""
+ #print "hi",query
return self.ZSQLSimpleSearch(query)
def ZSQLSearch(self):
@@ -684,6 +816,7 @@ class ZSQLExtendFolder(Folder,Persistent
def nextLink(self,html,storename="foundCount"):
"""nextLink"""
+
try:
limit=self.REQUEST.SESSION[storename]['rangeSize']
if int(limit)==0 :
@@ -702,12 +835,12 @@ class ZSQLExtendFolder(Folder,Persistent
if self.REQUEST['QUERY_STRING']=="":
qs=self.REQUEST.SESSION['query']
- queries=string.split(qs,",")
+ queries=string.split(qs,",")[0:]
else:
qs=self.REQUEST['QUERY_STRING']
- queries=string.split(qs,"&")
+ queries=string.split(qs,"&")[0:]
@@ -716,10 +849,9 @@ class ZSQLExtendFolder(Folder,Persistent
skipFound=0
for query in queries:
+
+ if query[0]=="_" : query="-"+query[1:]
- #print query.split("=")[0]
- if query[0]=="_" : query[0]="-"
-
if query.split("=")[0].lower()=="-skip":
skipFound=1
@@ -737,6 +869,7 @@ class ZSQLExtendFolder(Folder,Persistent
def prevLink(self,html,storename="foundCount"):
"""prev link"""
+
try:
limit=self.REQUEST.SESSION[storename]['rangeSize']
if int(limit)==0 :
@@ -1029,11 +1162,24 @@ class ZSQLBibliography(Folder,ZSQLExtend
def getMetaDatasXML(self):
"""index"""
+ # check if the request's host part was OK
+ http_host = self.REQUEST['HTTP_HOST']
+ host_port = self.REQUEST['SERVER_PORT']
+ fix_host = None
+ if http_host and http_host.rfind(host_port) == -1:
+ print "HTTP_HOST needs fixing!"
+ fix_host = http_host + ":" + host_port
+
ret="""
"""
for found in self.ZSQLSimpleSearch("select oid from %s limit ALL"%self.tableName):
- link=self.absolute_url()+"/"+"record.html?oid=%i"%found.oid
- metalink=self.absolute_url()+"/"+"getMetaDataXML?oid=%i"%found.oid
+ base_url = self.absolute_url()
+ if fix_host:
+ #print "replacing ", http_host, " by ", fix_host
+ base_url = string.replace(base_url, http_host, fix_host, 1)
+
+ link=base_url+"/"+"record.html?oid=%i"%found.oid
+ metalink=base_url+"/"+"getMetaDataXML?oid=%i"%found.oid
ret+="""\n"""%(link,metalink)