--- ZSQLExtend/ZSQLExtend.py 2004/07/13 17:41:37 1.25 +++ ZSQLExtend/ZSQLExtend.py 2004/07/28 15:13:00 1.29 @@ -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 @@ -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'] @@ -326,7 +366,8 @@ class ZSQLExtendFolder(Persistent, Impli #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]) @@ -538,12 +579,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'] @@ -555,12 +596,12 @@ class ZSQLExtendFolder(Persistent, Impli self.REQUEST.SESSION[storename]['rangeSize']=limit self.REQUEST.SESSION[storename]['searchFields']=searchFields - #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""" @@ -577,6 +618,8 @@ class ZSQLExtendFolder(Persistent, Impli """nothing""" #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)) @@ -606,10 +649,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>self.REQUEST.SESSION[storename]['count']: + if newRangeStart>=self.REQUEST.SESSION[storename]['count']: #newRangeStart=self.REQUEST.SESSION[storename]['count']-1 return "" @@ -637,7 +680,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) @@ -771,6 +814,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 +831,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 @@ -925,6 +970,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) @@ -935,13 +990,14 @@ 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 ret+="""\n"""%(link,metalink) return ret+"\n" + manage_addZSQLBibliographyForm=DTMLFile('ZSQLBibliographyAdd', globals())