--- ZSQLExtend/ZSQLExtend.py 2004/09/27 20:31:40 1.35 +++ ZSQLExtend/ZSQLExtend.py 2004/10/21 15:58:29 1.43 @@ -13,11 +13,26 @@ from Products.PageTemplates.PageTemplate from Products.ZSQLMethods.SQL import SQLConnectionIDs import Shared.DC.ZRDB.DA -def sql_quote(self, v): +def analyseIntSearch(word): + #analyse integer searches + + splitted=word.split("-") + + 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 find(v, dkey) >= 0: + if string.find(v, dkey) >= 0: v=join(split(v,dkey),quote_dict[dkey]) return "'%s'" % v @@ -40,10 +55,10 @@ class ZSQLExtendFolder(Folder,Persistent """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): @@ -243,6 +258,7 @@ class ZSQLExtendFolder(Folder,Persistent def ZSQLInlineSearch(self,storename=None,**argv): """inlinesearch""" + qs=[] if storename: """store""" @@ -253,7 +269,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) @@ -262,23 +283,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 [] @@ -335,18 +367,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 @@ -360,11 +392,11 @@ 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) @@ -397,7 +429,7 @@ 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']: @@ -507,6 +539,7 @@ class ZSQLExtendFolder(Folder,Persistent opfields={} lopfields={} #Verknüpfung bei mehrfachauswahl von einem feld sortfields={} #order of sortfields + sortAllFields=None skip="" rangeStart=0 limit=0 @@ -545,10 +578,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 @@ -564,7 +602,7 @@ class ZSQLExtendFolder(Folder,Persistent except: value="" - #value=libpq.PgQuoteString(value) + #value=sql_quote(value) if name==iCT+"lop": @@ -588,11 +626,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 @@ -614,24 +658,36 @@ 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 ') - + + 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 (not tableExt) or (namealt.split('.')[0]==tableExt): @@ -642,32 +698,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: @@ -690,7 +720,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": @@ -728,7 +758,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) @@ -738,6 +768,7 @@ class ZSQLExtendFolder(Folder,Persistent def ZSQLQuery(self,query): """query""" + #print "hi",query return self.ZSQLSimpleSearch(query) def ZSQLSearch(self): @@ -782,6 +813,7 @@ class ZSQLExtendFolder(Folder,Persistent def nextLink(self,html,storename="foundCount"): """nextLink""" + try: limit=self.REQUEST.SESSION[storename]['rangeSize'] if int(limit)==0 : @@ -800,12 +832,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:] @@ -814,10 +846,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 @@ -835,6 +866,7 @@ class ZSQLExtendFolder(Folder,Persistent def prevLink(self,html,storename="foundCount"): """prev link""" + try: limit=self.REQUEST.SESSION[storename]['rangeSize'] if int(limit)==0 :