--- ZSQLExtend/ZSQLExtend.py 2004/09/27 18:51:57 1.34 +++ ZSQLExtend/ZSQLExtend.py 2004/11/28 21:56:31 1.51 @@ -1,11 +1,11 @@ from OFS.Folder import Folder from Globals import Persistent from Acquisition import Implicit -from Globals import DTMLFile +from Globals import DTMLFile,package_home 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) @@ -27,15 +53,18 @@ class ZSQLExtendFolder(Folder,Persistent wherePart="museum_no like 'VAT%'" classes=['Uruk III','Uruk IV'] return self.searchRel(relStatement,statement,wherePart,classes) - + + def URLquote(self,txt): + """urlquote""" + return urllib.quote(txt) def searchRel(self,relStatement,statement,wherePart,classes): """suche relative haufigkeiten""" ret={} allRecords=len(self.ZSQLSimpleSearch(statement + " where "+wherePart)) - print statement + " where "+wherePart + for oneclass in classes: ret[oneclass]=len(self.ZSQLSimpleSearch(statement + " where ("+wherePart+") and "+ relStatement%oneclass)) - print statement + " where ("+wherePart+") and "+ relStatement%oneclass + return (ret,allRecords) def content_html(self): @@ -45,7 +74,7 @@ class ZSQLExtendFolder(Folder,Persistent obj=getattr(self,"ZSQLBibliography_template") return obj() except: - pt=PageTemplateFile('Products/ZSQLExtend/zpt/ZSQLBibliography_template_standard.zpt',content_type='text/htm').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ZSQLBibliography_template_standard.zpt'),content_type='text/html').__of__(self) pt.content_type="text/html" return pt() @@ -78,7 +107,7 @@ class ZSQLExtendFolder(Folder,Persistent def changeZSQLExtendForm(self): """change folder config""" - pt=PageTemplateFile('Products/ZSQLExtend/zpt/changeZSQLExtendForm.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changeZSQLExtendForm.zpt')).__of__(self) return pt() @@ -190,24 +219,38 @@ class ZSQLExtendFolder(Folder,Persistent ret+="""""" return ret - def ZSQLOptionsFromSearchList(self,fieldname,results,fieldName,valueName=None,start=None, multiple='',startValue=None): - """generate select oprions form a search list seperated list""" + def ZSQLOptionsFromSearchList(self,fieldname,results,fieldName,valueName=None,start=None, multiple='',startValue=None,additionalSelect=""): + """generate select options form a search list + es wird + - """%(fieldname,multiple) + ret="""""" return ret @@ -235,6 +278,7 @@ class ZSQLExtendFolder(Folder,Persistent def ZSQLInlineSearch(self,storename=None,**argv): """inlinesearch""" + qs=[] if storename: """store""" @@ -245,7 +289,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) @@ -254,23 +303,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 [] @@ -294,7 +354,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,",") @@ -304,7 +364,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=[] @@ -327,42 +387,17 @@ 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""" - qs=self.REQUEST['QUERY_STRING'] - #print "CHANGE QS",self.REQUEST - #return self.REQUEST - changeList=[] - for q in qs.split("&"): - name=urllib.unquote(re.sub("r'+'"," ",q.split("=")[0].lower())) - value=q.split("=")[1] - value=re.sub(r'\+'," ",value) - value=urllib.unquote(value) - if name=="-table": - table=urllib.unquote(value) - elif name=="-identify": - identify=urllib.unquote(value) - identify=identify.split("=")[0]+"="+libpq.PgQuoteString(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))) - 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""" @@ -388,8 +423,10 @@ class ZSQLExtendFolder(Folder,Persistent if (len(splitted)>1) and not (splitted[1]==' '): 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']: @@ -397,19 +434,27 @@ class ZSQLExtendFolder(Folder,Persistent qs=string.join(qs.split("&"),",") - + for field in argv.keys(): - - qs+=",-%s=%s"%(field,argv[field]) + if field[0]=="_": + fieldTmp="-"+field[1:] + else: + fieldTmp=field + + qs+=",%s=%s"%(fieldTmp,argv[field]) else: qs=self.REQUEST.SESSION.get('query','') for field in argv.keys(): - #print field - qs+=",-%s=%s"%(field,argv[field]) - + if field[0]=="_": + fieldTmp="-"+field[1:] + else: + fieldTmp=field + + qs+=",%s=%s"%(fieldTmp,argv[field]) + else: self.REQUEST['QUERY_STRING']=qs @@ -426,12 +471,15 @@ class ZSQLExtendFolder(Folder,Persistent else: storename="foundCount" + #store query for further usage + self.REQUEST.SESSION['query']=qs #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): @@ -486,19 +534,72 @@ class ZSQLExtendFolder(Folder,Persistent storename="foundCount" return str(min(int(self.REQUEST.SESSION[storename]['rangeEnd']),int(self.REQUEST.SESSION[storename]['count']))) + + def ZSQLNewQuery(self,linkText,storename=None,**argv): + """suche neu""" + return self.ZSQLNewSearch(linkText,storename,url=self.REQUEST['URL'],args=argv) + + def ZSQLNewSearch(self,linkText,storename=None,url=None,args=None,**argv): + """suche mit alten parametern bis auf die in argv getauschten""" + + if storename: + """store""" + else: + storename="foundCount" + qs=self.REQUEST.SESSION[storename]['qs'] + + if args: + argv=args + + querys=qs.split(",") + argList=[] + arg="" + queryList=[x.split("=")[0] for x in querys] + + for argTmp in argv.keys(): + + + arg=argTmp[0:] + if arg[0]=="_":arg="-"+argTmp[1:] # aender _ in - als standard + + if arg not in queryList: # noch nicht drin + querys.append("%s=%s"%(arg,argv[argTmp])) + argList.append(arg) + + + + newquery=[] + for query in querys: + queryArg=query.split("=")[0] + qarg=queryArg[0:] + if qarg[0]=="-":qarg="_"+queryArg[1:] # aender _ in - als standard + + if queryArg in argList: + newquery.append("%s=%s"%(queryArg,argv[qarg])) + else: + newquery.append(query) + + if url: + str=url+"?"+"&".join(newquery) + else: + str="ZSQLSearch?"+"&".join(newquery) + + return """ %s"""%(str,linkText) 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 - max="ALL" #standard alle auswählen + max="ALL" #standard alle auswaehlen maxstr="" whereList=[] sort="" op="bw" opfields={} - lopfields={} #Verknüpfung bei mehrfachauswahl von einem feld + lopfields={} #Verknuepfung bei mehrfachauswahl von einem feld sortfields={} #order of sortfields + sortAllFields=None skip="" rangeStart=0 limit=0 @@ -508,6 +609,9 @@ class ZSQLExtendFolder(Folder,Persistent select="oid,*" #print "Q",nostore,qs #check for op + + + splitted=qs.split(",") if tableExt: @@ -537,10 +641,15 @@ class ZSQLExtendFolder(Folder,Persistent lopfields[field]=lop if name[0:10]==iCT+"sortorder": - sort=value - + #sort=value + field=name[11:] - sortfields[field]=sort + sortAllFields=None + #no field selected + if field=="": + sortAllFields=value + else: + sortfields[field]=value #print "HI",op,field #print opfieldsa @@ -556,7 +665,7 @@ class ZSQLExtendFolder(Folder,Persistent except: value="" - #value=libpq.PgQuoteString(value) + #value=sql_quote(value) if name==iCT+"lop": @@ -580,11 +689,17 @@ class ZSQLExtendFolder(Folder,Persistent sortstrs=[] for word in value.split(','): wordstr=word.lstrip().rstrip() - order=sortfields.get(wordstr,'ASC') - sortstrs.append(wordstr+" "+order) + 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 @@ -606,25 +721,37 @@ class ZSQLExtendFolder(Folder,Persistent 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 "+libpq.PgQuoteString("%"+word+"%")) + tmps.append(name+" LIKE "+sql_quote("%"+word+"%")) tmp=string.join(tmps,' AND ') - - op="ct" + + 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="all" if (not tableExt) or (namealt.split('.')[0]==tableExt): if searchFields.has_key(name): @@ -634,32 +761,6 @@ class ZSQLExtendFolder(Folder,Persistent 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 - whereList=["("+searchFields[x]+")" for x in searchFields.keys()] if len(whereList)>0: @@ -682,7 +783,7 @@ class ZSQLExtendFolder(Folder,Persistent 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": @@ -696,6 +797,9 @@ class ZSQLExtendFolder(Folder,Persistent #print "QUERYSTRING:",self.REQUEST.SESSION[storename]['queryString2'] if not self.REQUEST.SESSION.has_key(storename): self.REQUEST.SESSION[storename]={} + + self.REQUEST.SESSION[storename]['qs']=qs #sichere Querystring + if self.REQUEST.SESSION[storename].has_key('queryString2'): if not self.REQUEST.SESSION[storename]['queryString2']==query2: @@ -720,7 +824,7 @@ class ZSQLExtendFolder(Folder,Persistent self.REQUEST.SESSION[storename]['rangeSize']=limit self.REQUEST.SESSION[storename]['searchFields']=searchFields self.REQUEST.SESSION[storename]['searchFieldsOnly']=searchFieldsOnly - + if not NoQuery: return self.ZSQLQuery(query) @@ -730,6 +834,7 @@ class ZSQLExtendFolder(Folder,Persistent def ZSQLQuery(self,query): """query""" + #print "hi",query return self.ZSQLSimpleSearch(query) def ZSQLSearch(self): @@ -737,14 +842,21 @@ class ZSQLExtendFolder(Folder,Persistent rq=self.REQUEST['QUERY_STRING'] querys=rq.split("&") - + formatfile=self.REQUEST['URL1'] #generisch redirect zur gleichen url + for querytemp in querys: query=querytemp.split("=") + + + print "fmtfile",formatfile + try: if query[0].lower()=="-format": formatfile=query[1] except: """nothing""" + + #print formatfile self.REQUEST.SESSION['query']=string.join(self.REQUEST['QUERY_STRING'].split("&"),",") @@ -774,6 +886,7 @@ class ZSQLExtendFolder(Folder,Persistent def nextLink(self,html,storename="foundCount"): """nextLink""" + try: limit=self.REQUEST.SESSION[storename]['rangeSize'] if int(limit)==0 : @@ -792,12 +905,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:] @@ -806,10 +919,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 @@ -821,12 +933,13 @@ class ZSQLExtendFolder(Folder,Persistent newquery.append(query) newquerystring=string.join(newquery,"&") - - return "%s"%(self.actualPath()+"?"+newquerystring,html) + return "%s"%(self.REQUEST['URL']+"?"+newquerystring,html) + def prevLink(self,html,storename="foundCount"): """prev link""" + try: limit=self.REQUEST.SESSION[storename]['rangeSize'] if int(limit)==0 : @@ -847,7 +960,7 @@ class ZSQLExtendFolder(Folder,Persistent if self.REQUEST['QUERY_STRING']=="": qs=self.REQUEST.SESSION['query'] - #qs=re.sub(r'_','-',qs) #aendern für query + #qs=re.sub(r'_','-',qs) #aendern fuer query queries=string.split(qs,",") @@ -878,7 +991,7 @@ class ZSQLExtendFolder(Folder,Persistent newquerystring=string.join(newquery,"&") - return "%s"%(self.actualPath()+"?"+newquerystring,html) + return "%s"%(self.REQUEST['URL']+"?"+newquerystring,html) @@ -1003,7 +1116,7 @@ class ZSQLBibliography(Folder,ZSQLExtend def changeZSQLBibliographyForm(self): """change folder config""" - pt=PageTemplateFile('Products/ZSQLExtend/zpt/changeZSQLBibliographyForm.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changeZSQLBibliographyForm.zpt')).__of__(self) return pt() @@ -1014,7 +1127,7 @@ class ZSQLBibliography(Folder,ZSQLExtend obj=getattr(self,"ZSQLBibliography_template") return obj() except: - pt=PageTemplateFile('Products/ZSQLExtend/zpt/ZSQLBibliography_template_standard.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ZSQLBibliography_template_standard.zpt')).__of__(self) pt.content_type="text/html" return pt() @@ -1107,23 +1220,36 @@ class ZSQLBibliography(Folder,ZSQLExtend fn=os.path.splitext(self.REQUEST['fn'])[0]+"." self.REQUEST['fn']=fn - pt=PageTemplateFile('Products/ZSQLExtend/zpt/record2.xml').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','record2.xml')).__of__(self) pt.content_type="text/xml" return pt() def getMetaDataXML(self): """crate index meta""" - pt=PageTemplateFile('Products/ZSQLExtend/zpt/record.xml').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','record.xml')).__of__(self) pt.content_type="text/xml" return pt() 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)