--- ZSQLExtend/ZSQLExtend.py 2004/10/21 15:58:29 1.43 +++ ZSQLExtend/ZSQLExtend.py 2004/11/27 22:41:43 1.50 @@ -1,7 +1,7 @@ from OFS.Folder import Folder from Globals import Persistent from Acquisition import Implicit -from Globals import DTMLFile +from Globals import DTMLFile,package_home import urllib import re import string @@ -18,6 +18,9 @@ def analyseIntSearch(word): splitted=word.split("-") + if len(splitted)==1: + return "="+splitted[0] + if splitted[0]=="": return "< "+splitted[1] @@ -68,7 +71,7 @@ class ZSQLExtendFolder(Folder,Persistent obj=getattr(self,"ZSQLBibliography_template") return obj() except: - pt=PageTemplateFile('Products/ZSQLExtend/zpt/ZSQLBibliography_template_standard.zpt',content_type='text/htm').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ZSQLBibliography_template_standard.zpt'),content_type='text/html').__of__(self) pt.content_type="text/html" return pt() @@ -101,7 +104,7 @@ class ZSQLExtendFolder(Folder,Persistent def changeZSQLExtendForm(self): """change folder config""" - pt=PageTemplateFile('Products/ZSQLExtend/zpt/changeZSQLExtendForm.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changeZSQLExtendForm.zpt')).__of__(self) return pt() @@ -213,24 +216,38 @@ class ZSQLExtendFolder(Folder,Persistent ret+="""""" return ret - def ZSQLOptionsFromSearchList(self,fieldname,results,fieldName,valueName=None,start=None, multiple='',startValue=None): - """generate select oprions form a search list seperated list""" + def ZSQLOptionsFromSearchList(self,fieldname,results,fieldName,valueName=None,start=None, multiple='',startValue=None,additionalSelect=""): + """generate select options form a search list + es wird + - """%(fieldname,multiple) + ret="""""" return ret @@ -377,32 +394,7 @@ class ZSQLExtendFolder(Folder,Persistent self.ZSQLSimpleSearch(queryString) return self.REQUEST.RESPONSE.redirect(format) - def ZSQLChange_old(self): - """change entries""" - qs=self.REQUEST['QUERY_STRING'] - #print "CHANGE QS",self.REQUEST - #return self.REQUEST - changeList=[] - for q in qs.split("&"): - name=urllib.unquote(re.sub("r'+'"," ",q.split("=")[0].lower())) - value=q.split("=")[1] - value=re.sub(r'\+'," ",value) - value=urllib.unquote(value) - if name=="-table": - table=urllib.unquote(value) - elif name=="-identify": - identify=urllib.unquote(value) - 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+"\"="+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 ZSQLFind2(self,qs="",select="oid,*",storename=None,tableList=['cdli_translit','cdli_cat'],**argv): """find2""" @@ -428,7 +420,9 @@ class ZSQLExtendFolder(Folder,Persistent if (len(splitted)>1) and not (splitted[1]==' '): ret.append(x) return ret - + + + #self.REQUEST.SESSION['come_from_search']="no" # zuruecksetzen if qs=="": @@ -437,19 +431,27 @@ class ZSQLExtendFolder(Folder,Persistent qs=string.join(qs.split("&"),",") - + for field in argv.keys(): - - qs+=",-%s=%s"%(field,argv[field]) + if field[0]=="_": + fieldTmp="-"+field[1:] + else: + fieldTmp=field + + qs+=",%s=%s"%(fieldTmp,argv[field]) else: qs=self.REQUEST.SESSION.get('query','') for field in argv.keys(): - #print field - qs+=",-%s=%s"%(field,argv[field]) - + if field[0]=="_": + fieldTmp="-"+field[1:] + else: + fieldTmp=field + + qs+=",%s=%s"%(fieldTmp,argv[field]) + else: self.REQUEST['QUERY_STRING']=qs @@ -466,12 +468,15 @@ class ZSQLExtendFolder(Folder,Persistent else: storename="foundCount" + #store query for further usage + self.REQUEST.SESSION['query']=qs #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): @@ -526,18 +531,70 @@ class ZSQLExtendFolder(Folder,Persistent storename="foundCount" return str(min(int(self.REQUEST.SESSION[storename]['rangeEnd']),int(self.REQUEST.SESSION[storename]['count']))) + + def ZSQLNewQuery(self,linkText,storename=None,**argv): + """suche neu""" + return self.ZSQLNewSearch(linkText,storename,url=self.REQUEST['URL'],args=argv) + + def ZSQLNewSearch(self,linkText,storename=None,url=None,args=None,**argv): + """suche mit alten parametern bis auf die in argv getauschten""" + + if storename: + """store""" + else: + storename="foundCount" + qs=self.REQUEST.SESSION[storename]['qs'] + + if args: + argv=args + + querys=qs.split(",") + argList=[] + arg="" + queryList=[x.split("=")[0] for x in querys] + + for argTmp in argv.keys(): + + + arg=argTmp[0:] + if arg[0]=="_":arg="-"+argTmp[1:] # aender _ in - als standard + + if arg not in queryList: # noch nicht drin + querys.append("%s=%s"%(arg,argv[argTmp])) + argList.append(arg) + + + + newquery=[] + for query in querys: + queryArg=query.split("=")[0] + qarg=queryArg[0:] + if qarg[0]=="-":qarg="_"+queryArg[1:] # aender _ in - als standard + + if queryArg in argList: + newquery.append("%s=%s"%(queryArg,argv[qarg])) + else: + newquery.append(query) + + if url: + str=url+"?"+"&".join(newquery) + else: + str="ZSQLSearch?"+"&".join(newquery) + + return """ %s"""%(str,linkText) 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 - max="ALL" #standard alle auswählen + max="ALL" #standard alle auswaehlen maxstr="" whereList=[] sort="" op="bw" opfields={} - lopfields={} #Verknüpfung bei mehrfachauswahl von einem feld + lopfields={} #Verknuepfung bei mehrfachauswahl von einem feld sortfields={} #order of sortfields sortAllFields=None skip="" @@ -549,6 +606,9 @@ class ZSQLExtendFolder(Folder,Persistent select="oid,*" #print "Q",nostore,qs #check for op + + + splitted=qs.split(",") if tableExt: @@ -688,7 +748,7 @@ class ZSQLExtendFolder(Folder,Persistent tmp=string.join(tmps,' OR ') - op="ct" + op="all" if (not tableExt) or (namealt.split('.')[0]==tableExt): if searchFields.has_key(name): @@ -734,6 +794,9 @@ class ZSQLExtendFolder(Folder,Persistent #print "QUERYSTRING:",self.REQUEST.SESSION[storename]['queryString2'] if not self.REQUEST.SESSION.has_key(storename): self.REQUEST.SESSION[storename]={} + + self.REQUEST.SESSION[storename]['qs']=qs #sichere Querystring + if self.REQUEST.SESSION[storename].has_key('queryString2'): if not self.REQUEST.SESSION[storename]['queryString2']==query2: @@ -776,14 +839,21 @@ class ZSQLExtendFolder(Folder,Persistent rq=self.REQUEST['QUERY_STRING'] querys=rq.split("&") - + formatfile=self.REQUEST['URL1'] #generisch redirect zur gleichen url + for querytemp in querys: query=querytemp.split("=") + + + print "fmtfile",formatfile + try: if query[0].lower()=="-format": formatfile=query[1] except: """nothing""" + + #print formatfile self.REQUEST.SESSION['query']=string.join(self.REQUEST['QUERY_STRING'].split("&"),",") @@ -860,8 +930,8 @@ class ZSQLExtendFolder(Folder,Persistent newquery.append(query) newquerystring=string.join(newquery,"&") - - return "%s"%(self.actualPath()+"?"+newquerystring,html) + return "%s"%(self.REQUEST['URL']+"?"+newquerystring,html) + def prevLink(self,html,storename="foundCount"): @@ -887,7 +957,7 @@ class ZSQLExtendFolder(Folder,Persistent if self.REQUEST['QUERY_STRING']=="": qs=self.REQUEST.SESSION['query'] - #qs=re.sub(r'_','-',qs) #aendern für query + #qs=re.sub(r'_','-',qs) #aendern fuer query queries=string.split(qs,",") @@ -918,7 +988,7 @@ class ZSQLExtendFolder(Folder,Persistent newquerystring=string.join(newquery,"&") - return "%s"%(self.actualPath()+"?"+newquerystring,html) + return "%s"%(self.REQUEST['URL']+"?"+newquerystring,html) @@ -1043,7 +1113,7 @@ class ZSQLBibliography(Folder,ZSQLExtend def changeZSQLBibliographyForm(self): """change folder config""" - pt=PageTemplateFile('Products/ZSQLExtend/zpt/changeZSQLBibliographyForm.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changeZSQLBibliographyForm.zpt')).__of__(self) return pt() @@ -1054,7 +1124,7 @@ class ZSQLBibliography(Folder,ZSQLExtend obj=getattr(self,"ZSQLBibliography_template") return obj() except: - pt=PageTemplateFile('Products/ZSQLExtend/zpt/ZSQLBibliography_template_standard.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ZSQLBibliography_template_standard.zpt')).__of__(self) pt.content_type="text/html" return pt() @@ -1147,13 +1217,13 @@ class ZSQLBibliography(Folder,ZSQLExtend fn=os.path.splitext(self.REQUEST['fn'])[0]+"." self.REQUEST['fn']=fn - pt=PageTemplateFile('Products/ZSQLExtend/zpt/record2.xml').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'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) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','record.xml')).__of__(self) pt.content_type="text/xml" return pt()