--- ZSQLExtend/ZSQLExtend.py 2004/08/18 14:47:58 1.31 +++ ZSQLExtend/ZSQLExtend.py 2004/09/27 18:51:57 1.34 @@ -20,6 +20,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)) + 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): """template fuer content""" @@ -172,8 +190,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 +200,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) @@ -340,8 +361,24 @@ class ZSQLExtendFolder(Folder,Persistent 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 - def ZSQLFind(self,qs="",select="oid,*",storename=None,**argv): + #return self.ZSQLFind(qs="",select="oid,*",storename=None,tableExt=None,NoQuery=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): @@ -354,9 +391,10 @@ class ZSQLExtendFolder(Folder,Persistent #self.REQUEST.SESSION['come_from_search']="no" # zurücksetzen if qs=="": + if self.REQUEST['QUERY_STRING']: qs=self.REQUEST['QUERY_STRING'] - + qs=string.join(qs.split("&"),",") @@ -389,11 +427,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 +487,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 +498,7 @@ class ZSQLExtendFolder(Folder,Persistent op="bw" opfields={} lopfields={} #Verknüpfung bei mehrfachauswahl von einem feld + sortfields={} #order of sortfields skip="" rangeStart=0 limit=0 @@ -471,7 +510,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 +535,13 @@ class ZSQLExtendFolder(Folder,Persistent field=name[5:] lopfields[field]=lop + + if name[0:10]==iCT+"sortorder": + sort=value + + field=name[11:] + sortfields[field]=sort + #print "HI",op,field #print opfieldsa #now analyse the querystring @@ -512,19 +562,29 @@ class ZSQLExtendFolder(Folder,Persistent 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() + order=sortfields.get(wordstr,'ASC') + 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,6 +603,7 @@ class ZSQLExtendFolder(Folder,Persistent op=opfields[name] else: op="ct" + namealt=name name="LOWER("+name+")" if op=="ct": tmp=(name+" LIKE "+libpq.PgQuoteString("%"+value+"%")) @@ -556,14 +617,22 @@ class ZSQLExtendFolder(Folder,Persistent tmp=(name+" LIKE "+libpq.PgQuoteString(value+"%")) elif op=="ew": tmp=(name+" LIKE "+libpq.PgQuoteString("%"+value)) - op="ct" + elif op=="all": + tmps=[] + for word in value.split(" "): + tmps.append(name+" LIKE "+libpq.PgQuoteString("%"+word+"%")) + + tmp=string.join(tmps,' AND ') - 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 + op="ct" + + 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 ## for name in searchFields.keys(): @@ -594,9 +663,24 @@ class ZSQLExtendFolder(Folder,Persistent 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 query="SELECT %s FROM %s %s %s %s %s"%(select,table,where,sort,maxstr,skip) @@ -606,21 +690,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'] @@ -635,9 +721,13 @@ class ZSQLExtendFolder(Folder,Persistent self.REQUEST.SESSION[storename]['searchFields']=searchFields self.REQUEST.SESSION[storename]['searchFieldsOnly']=searchFieldsOnly + if not NoQuery: - return self.ZSQLQuery(query) + return self.ZSQLQuery(query) + else: + return query + def ZSQLQuery(self,query): """query""" return self.ZSQLSimpleSearch(query)