--- ZSQLExtend/ZSQLExtend.py 2004/07/13 13:54:54 1.22 +++ ZSQLExtend/ZSQLExtend.py 2004/08/18 14:47:58 1.31 @@ -10,9 +10,13 @@ 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" @@ -60,9 +64,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,23 +162,23 @@ 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): + def ZSQLOptionsFromSearchList(self,fieldname,results,fieldName,valueName=None,start=None, multiple=''): """generate select oprions form a cr seperated list""" if not valueName: valueName=fieldName - ret=""" + """%(fieldname,multiple) if start: if start==' ': start='' @@ -187,7 +191,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 +235,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 +279,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 +313,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,7 +338,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 ZSQLFind(self,qs="",select="oid,*",storename=None,**argv): @@ -312,7 +351,8 @@ 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'] @@ -323,10 +363,11 @@ class ZSQLExtendFolder(Persistent, Impli 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,7 +389,7 @@ class ZSQLExtendFolder(Persistent, Impli storename="foundCount" - + ret=self.parseQueryString(qs,"-",select=select,storemax="yes",storename=storename) #print self.REQUEST.SESSION["foundCount"] @@ -406,7 +447,7 @@ class ZSQLExtendFolder(Persistent, Impli else: storename="foundCount" - return self.REQUEST.SESSION[storename]['rangeEnd'] + 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): """analysieren den QueryString""" @@ -418,15 +459,16 @@ 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(",") @@ -444,6 +486,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 @@ -476,7 +524,7 @@ class ZSQLExtendFolder(Persistent, Impli 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,30 +538,61 @@ 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" + 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 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+" ") else: @@ -538,12 +617,12 @@ class ZSQLExtendFolder(Persistent, Impli 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 +633,14 @@ 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) def ZSQLQuery(self,query): """query""" - return self.search(var=query) + return self.ZSQLSimpleSearch(query) def ZSQLSearch(self): """To be done""" @@ -575,8 +655,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 +673,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"): @@ -606,12 +690,12 @@ class ZSQLExtendFolder(Persistent, Impli limit="1" newRangeStart=int(self.REQUEST.SESSION[storename]['rangeStart'])+int(limit) except: - limit=0 + limit=1 newRangeStart=0 - if newRangeStart>self.REQUEST.SESSION[storename]['count']: - newRangeStart=self.REQUEST.SESSION[storename]['count']-10 - + if newRangeStart>=self.REQUEST.SESSION[storename]['count']: + #newRangeStart=self.REQUEST.SESSION[storename]['count']-1 + return "" #create new query string @@ -637,7 +721,7 @@ class ZSQLExtendFolder(Persistent, Impli if query[0]=="_" : query[0]="-" if query.split("=")[0].lower()=="-skip": - print "d", newRangeStart + skipFound=1 query="-skip=%i"%newRangeStart newquery.append(query) @@ -659,8 +743,10 @@ class ZSQLExtendFolder(Persistent, Impli limit="1" newRangeStart=int(self.REQUEST.SESSION[storename]['rangeStart'])-int(limit) except: - limit=0 + limit=1 newRangeStart=0 + if newRangeStart <0: + return "" #print "limit",limit,newRangeStart,int(self.REQUEST.SESSION[storename]['rangeStart']) @@ -769,6 +855,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*. @@ -785,6 +872,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 @@ -890,7 +978,10 @@ class ZSQLBibliography(Folder,ZSQLExtend bibdata['data']=referenceTypeF[1] self.fields=bibdata[referenceType] for field in fieldlist: - retdata[field]=referenceTypeF[1].getValue(field)[0] + if referenceTypeF[1].getValue(field)[0]==None: + retdata[field]=field + else: + retdata[field]=referenceTypeF[1].getValue(field)[0] return retdata,fieldlist @@ -920,6 +1011,16 @@ class ZSQLBibliography(Folder,ZSQLExtend else: return "" + def getMetaDataXML2(self): + """crate index meta""" + + fn=os.path.splitext(self.REQUEST['fn'])[0]+"." + self.REQUEST['fn']=fn + + pt=PageTemplateFile('Products/ZSQLExtend/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) @@ -930,13 +1031,14 @@ class ZSQLBibliography(Folder,ZSQLExtend """index""" ret=""" """ - for found in self.search(var="select oid from %s"%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 ret+="""\n"""%(link,metalink) return ret+"\n" + manage_addZSQLBibliographyForm=DTMLFile('ZSQLBibliographyAdd', globals())