--- ZSQLExtend/ZSQLExtend.py 2004/07/19 17:31:02 1.26 +++ ZSQLExtend/ZSQLExtend.py 2004/09/12 11:05:43 1.33 @@ -10,12 +10,34 @@ from AccessControl import getSecurityMan import os.path from Products.PageTemplates.PageTemplateFile import PageTemplateFile +from Products.ZSQLMethods.SQL import SQLConnectionIDs +import Shared.DC.ZRDB.DA +def showSQLConnectionIDs(self): + return SQLConnectionIDs(self) -class ZSQLExtendFolder(Persistent, Implicit, Folder): +class ZSQLExtendFolder(Folder,Persistent, Implicit): """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""" @@ -60,9 +82,9 @@ class ZSQLExtendFolder(Persistent, Impli return pt() - def changeZSQLExtend(self,label,description,weight=0,REQUEST=None): + def changeZSQLExtend(self,label,description,weight=0,REQUEST=None,connection_id=None): """change it""" - + self.connection_id=connection_id self.weight=weight self.label=label self.description=description @@ -158,27 +180,30 @@ class ZSQLExtendFolder(Persistent, Impli return ret - def ZSQLOptionsFromCRList(self,fieldname,listField): + def ZSQLOptionsFromCRList(self,fieldname,listField, multiple=''): """generate select oprions form a cr seperated list""" fields=listField.split("\n") - ret=""" + """%(fieldname,multiple) for field in fields: ret+=""""""%(field.encode('utf-8'),field.encode('utf-8')) ret+="""""" return ret - def ZSQLOptionsFromSearchList(self,fieldname,results,fieldName,valueName=None,start=None): - """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 - ret=""" + """%(fieldname,multiple) 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) @@ -187,7 +212,27 @@ class ZSQLExtendFolder(Persistent, Impli return ret + def ZSQLInlineSearchU(self,storename=None,**argv): + """one element if exists""" + qs=[] + if storename: + """store""" + else: + storename="foundCount" + + + #print "INLINE:",argv + for a in argv.keys(): + qs.append(a+"="+urllib.quote(str(argv[a]))) + #return [] + ret = self.parseQueryString(string.join(qs,","),"_",storename=storename) + + try: + return ret[0] + except: + return None + def ZSQLInlineSearch(self,storename=None,**argv): """inlinesearch""" qs=[] @@ -211,9 +256,24 @@ class ZSQLExtendFolder(Persistent, Impli #print "INLINE:",query + return self.ZSQLSimpleSearch(query) - return self.search(var=query) + + def ZSQLSimpleSearch(self,query=None): + """ returrn SQLSearch""" + if not query: + query=self.query + + if self.search.meta_type=="Z SQL Method": + return self.search(var=query) + else: + if self.aq_parent.aq_parent.search.meta_type=="Z SQL Method": + return self.aq_parent.aq_parent.search(var=query) + else: + return [] + + def ZSQLAdd(self): """Neuer Eintrag""" qs=self.REQUEST['QUERY_STRING'] @@ -240,7 +300,7 @@ class ZSQLExtendFolder(Persistent, Impli valueString=string.join(valueList,",") queryString="INSERT INTO %s (%s) VALUES (%s)"%(table,keyString,valueString) - self.search(var=queryString) + self.ZSQLSimpleSearch(queryString) return self.REQUEST.RESPONSE.redirect(format) def ZSQLChange(self,**argv): @@ -274,7 +334,7 @@ class ZSQLExtendFolder(Persistent, Impli changeList.append("\""+name+"\"="+libpq.PgQuoteString(urllib.unquote(value))) changeString=string.join(changeList,",") queryString="UPDATE %s SET %s WHERE %s"%(table,changeString,identify) - self.search(var=queryString) + self.ZSQLSimpleSearch(queryString) return self.REQUEST.RESPONSE.redirect(format) def ZSQLChange_old(self): @@ -299,10 +359,26 @@ class ZSQLExtendFolder(Persistent, Impli changeList.append("\""+name+"\"="+libpq.PgQuoteString(urllib.unquote(value))) changeString=string.join(changeList,",") queryString="UPDATE %s SET %s WHERE %s"%(table,changeString,identify) - self.search(var=queryString) + 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): @@ -312,21 +388,24 @@ class ZSQLExtendFolder(Persistent, Impli if (len(splitted)>1) and not (splitted[1]==' '): ret.append(x) return ret - + + #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("&"),",") for field in argv.keys(): qs+=",-%s=%s"%(field,argv[field]) - #print qs + else: - qs=self.REQUEST.SESSION['query'] + qs=self.REQUEST.SESSION.get('query','') + for field in argv.keys(): #print field qs+=",-%s=%s"%(field,argv[field]) @@ -348,11 +427,11 @@ class ZSQLExtendFolder(Persistent, Impli 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): @@ -408,7 +487,7 @@ class ZSQLExtendFolder(Persistent, Impli 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 @@ -418,18 +497,23 @@ class ZSQLExtendFolder(Persistent, Impli sort="" op="bw" opfields={} + lopfields={} #Verknüpfung bei mehrfachauswahl von einem feld skip="" rangeStart=0 limit=0 searchFields={} - + searchFieldsOnly={} if not select: select="oid,*" #print "Q",nostore,qs - #check for op in the case of inline search + #check for op splitted=qs.split(",") - + if tableExt: + table=tableExt + + if restrictField: + select=restrictField for q in splitted: @@ -444,6 +528,12 @@ class ZSQLExtendFolder(Persistent, Impli field=name[4:] opfields[field]=op + + if name[0:4]==iCT+"lop": + lop=value + + field=name[5:] + lopfields[field]=lop #print "HI",op,field #print opfieldsa #now analyse the querystring @@ -464,19 +554,22 @@ class ZSQLExtendFolder(Persistent, Impli 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 + sort="ORDER BY "+value.replace(' AND ',',') elif name==iCT+"token": if not nostore=="yes": self.REQUEST.SESSION['token']=value @@ -490,34 +583,82 @@ class ZSQLExtendFolder(Persistent, Impli #print "OP",op,name value=value.lower() - - searchFields[name]=value - + tmp="" if opfields.has_key(name): op=opfields[name] - else: - op="ct" - name="LOWER("+name+")" + else: + op="ct" + namealt=name + name="LOWER("+name+")" if op=="ct": - whereList.append(name+" LIKE "+libpq.PgQuoteString("%"+value+"%")) + tmp=(name+" LIKE "+libpq.PgQuoteString("%"+value+"%")) elif op=="gt": - whereList.append(name+">"+libpq.PgQuoteString(value)) + tmp=(name+">"+libpq.PgQuoteString(value)) elif op=="lt": - whereList.append(name+"<"+libpq.PgQuoteString(value)) + tmp=(name+"<"+libpq.PgQuoteString(value)) elif op=="eq": - whereList.append(name+"="+libpq.PgQuoteString(value)) + tmp=(name+"="+libpq.PgQuoteString(value)) elif op=="bw": - whereList.append(name+" LIKE "+libpq.PgQuoteString(value+"%")) + tmp=(name+" LIKE "+libpq.PgQuoteString(value+"%")) elif op=="ew": - whereList.append(name+" LIKE "+libpq.PgQuoteString("%"+value)) + tmp=(name+" LIKE "+libpq.PgQuoteString("%"+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 + - #except: - # print "END",value,name,Exception + ## 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: - 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) @@ -527,23 +668,25 @@ class ZSQLExtendFolder(Persistent, Impli 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.search(var=query2)[0].count + 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.search(var=query2)[0].count + self.REQUEST.SESSION[storename]['count']=self.ZSQLSimpleSearch(query2)[0].count #print "QUERYNEW",self.REQUEST.SESSION[storename]['queryString2'] @@ -554,13 +697,18 @@ class ZSQLExtendFolder(Persistent, Impli self.REQUEST.SESSION[storename]['rangeEnd']=int(rangeStart)+int(limit) self.REQUEST.SESSION[storename]['rangeSize']=limit self.REQUEST.SESSION[storename]['searchFields']=searchFields + self.REQUEST.SESSION[storename]['searchFieldsOnly']=searchFieldsOnly - #print "Q",query - return self.ZSQLQuery(query) + if not NoQuery: + + return self.ZSQLQuery(query) + else: + return query + def ZSQLQuery(self,query): """query""" - return self.search(var=query) + return self.ZSQLSimpleSearch(query) def ZSQLSearch(self): """To be done""" @@ -575,8 +723,11 @@ class ZSQLExtendFolder(Persistent, Impli formatfile=query[1] except: """nothing""" - #print formatfile + #print formatfile + self.REQUEST.SESSION['query']=string.join(self.REQUEST['QUERY_STRING'].split("&"),",") + self.REQUEST.SESSION['come_from_search']="yes" + return self.REQUEST.RESPONSE.redirect(urllib.unquote(formatfile)) @@ -590,12 +741,13 @@ class ZSQLExtendFolder(Persistent, Impli def getZSQLSearchFieldsList(self,storename="foundCount"): """get searchfieldList""" #print self.REQUEST.SESSION[storename]['searchFields'].keys() - return self.REQUEST.SESSION[storename]['searchFields'].keys() + return self.REQUEST.SESSION[storename]['searchFieldsOnly'].keys() - def getZSQLSearchFields(self,storename="foundCount"): + def getZSQLSearchFields(self,field,storename="foundCount"): """get searchfield""" #print "SF",self.REQUEST.SESSION[storename]['searchFields'] - return self.REQUEST.SESSION[storename]['searchFields'] + + return self.REQUEST.SESSION[storename]['searchFieldsOnly'][field] def nextLink(self,html,storename="foundCount"): @@ -771,6 +923,7 @@ manage_addZSQLExtendFolderForm=DTMLFile( def manage_addZSQLExtendFolder(self, id, title='', label='', description='', createPublic=0, createUserF=0, + connection_id=None, REQUEST=None): """Add a new Folder object with id *id*. @@ -787,6 +940,7 @@ def manage_addZSQLExtendFolder(self, id, ob=self._getOb(id) setattr(ob,'label',label) setattr(ob,'description',description) + setattr(ob,'connection_id',connection_id) checkPermission=getSecurityManager().checkPermission @@ -945,7 +1099,7 @@ class ZSQLBibliography(Folder,ZSQLExtend """index""" ret=""" """ - for found in self.search(var="select oid from %s limit ALL"%self.tableName): + 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