--- ZSQLExtend/ZSQLExtend.py 2004/07/12 17:01:55 1.21 +++ ZSQLExtend/ZSQLExtend.py 2004/12/04 21:33:12 1.52 @@ -1,21 +1,72 @@ 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 -from pyPgSQL import libpq +#from pyPgSQL import libpq from AccessControl import getSecurityManager import os.path from Products.PageTemplates.PageTemplateFile import PageTemplateFile +from Products.ZSQLMethods.SQL import SQLConnectionIDs +import Shared.DC.ZRDB.DA +def analyseIntSearch(word): + #analyse integer searches -class ZSQLExtendFolder(Persistent, Implicit, Folder): + splitted=word.split("-") + + if len(splitted)==1: + return "="+splitted[0] + + if splitted[0]=="": + return "< "+splitted[1] + + if splitted[1]=='': + return "> "+splitted[0] + else: + return "BETWEEN "+splitted[0]+" AND "+splitted[1] + + + +def sql_quote(v): + # quote dictionary + quote_dict = {"\'": "''", "\\": "\\\\"} + for dkey in quote_dict.keys(): + if string.find(v, dkey) >= 0: + v=join(split(v,dkey),quote_dict[dkey]) + return "'%s'" % v + +def showSQLConnectionIDs(self): + return SQLConnectionIDs(self) + +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 URLquote(self,txt): + """urlquote""" + return urllib.quote(txt) + def searchRel(self,relStatement,statement,wherePart,classes): + """suche relative haufigkeiten""" + ret={} + allRecords=len(self.ZSQLSimpleSearch(statement + " where "+wherePart)) + + for oneclass in classes: + ret[oneclass]=len(self.ZSQLSimpleSearch(statement + " where ("+wherePart+") and "+ relStatement%oneclass)) + + return (ret,allRecords) + def content_html(self): """template fuer content""" @@ -23,7 +74,7 @@ class ZSQLExtendFolder(Persistent, Impli 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() @@ -56,13 +107,13 @@ class ZSQLExtendFolder(Persistent, Impli 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() - 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,38 +209,76 @@ 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,additionalSelect=""): + """generate select options form a search list + es wird + - """%fieldname + ret="""""" 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=[] if storename: """store""" @@ -200,7 +289,12 @@ class ZSQLExtendFolder(Persistent, Impli #print "INLINE:",argv for a in argv.keys(): - qs.append(a+"="+urllib.quote(str(argv[a]))) + try: + qs.append(a+"="+urllib.quote(str(argv[a]))) + except: + import urllib + qs.append(a+"="+urllib.quote(str(argv[a]))) + #return [] return self.parseQueryString(string.join(qs,","),"_",storename=storename) @@ -209,11 +303,37 @@ class ZSQLExtendFolder(Persistent, Impli qs=[] - + #print "INLINE:",query + return self.ZSQLSimpleSearch(query) - return self.search(var=query) + + def ZSQLSimpleSearch(self,query=None): + """ returrn SQLSearch""" + #print "hi",query + if not query: + query=self.query + if getattr(self,'_v_search',None): + + return self._v_search(var=query) + + if hasattr(self,'search') and (self.search.meta_type=="Z SQL Method"): + self._v_search=self.search + return self.search(var=query) + else: + if hasattr(self.aq_parent.aq_parent,'search') and (self.aq_parent.aq_parent.search.meta_type=="Z SQL Method"): + self._v_search=self.aq_parent.aq_parent.search + return self.aq_parent.aq_parent.search(var=query) + else: + search=self.ZopeFind(self,obj_metatypes=["Z SQL Method"],search_sub=1) + if search: + self._v_search=search[0][1] + return search[0][1](var=query) + else: + return [] + + def ZSQLAdd(self): """Neuer Eintrag""" qs=self.REQUEST['QUERY_STRING'] @@ -234,17 +354,17 @@ class ZSQLExtendFolder(Persistent, Impli valueList=[] for x in addList.keys(): keyList.append("\""+x+"\"") - valueList.append(libpq.PgQuoteString(addList[x])) + valueList.append(sql_quote(addList[x])) keyString=string.join(keyList,",") 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): - """Ändern von Einträgen""" + """change entries""" #qs=self.REQUEST['QUERY_STRING'] # very bad hack qs_temp=[] @@ -267,42 +387,29 @@ class ZSQLExtendFolder(Persistent, Impli table=urllib.unquote(value) elif name=="-identify": identify=urllib.unquote(value) - identify=identify.split("=")[0]+"="+libpq.PgQuoteString(identify.split("=")[1]) + 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+"\"="+libpq.PgQuoteString(urllib.unquote(value))) + changeList.append("\""+name+"\"="+sql_quote(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): - """Ändern von Einträgen""" - 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]+"="+libpq.PgQuoteString(identify.split("=")[1]) - elif name=="-format": - format=urllib.unquote(value) - elif (not name[0]=="-") and (not len(value)==0): - 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) - return self.REQUEST.RESPONSE.redirect(format) + + + def ZSQLFind2(self,qs="",select="oid,*",storename=None,tableList=['cdli_translit','cdli_cat'],restrictField='id_text',**argv): + """find2""" + + search1= self.ZSQLFind(qs=qs,select=select,storename=storename,tableExt=tableList[1],restrictField=restrictField,NoQuery='yes',NoLimit='yes',**argv) + + search2 = self.ZSQLFind(tableExt=tableList[0],qs=qs,select=select,storename=storename,restrictConnect=(tableList[0]+"."+restrictField,search1),**argv) + return search2 + + - 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,25 +419,43 @@ class ZSQLExtendFolder(Persistent, Impli if (len(splitted)>1) and not (splitted[1]==' '): ret.append(x) return ret - + + + + #self.REQUEST.SESSION['come_from_search']="no" # zuruecksetzen if qs=="": + if self.REQUEST['QUERY_STRING']: qs=self.REQUEST['QUERY_STRING'] - + qs=string.join(qs.split("&"),",") - + for field in argv.keys(): + if field[0]=="_": + fieldTmp="-"+field[1:] + else: + fieldTmp=field + + qs+=",%s=%s"%(fieldTmp,argv[field]) - qs+=",-%s=%s"%(field,argv[field]) - #print qs else: + + qs=self.REQUEST.SESSION.get('query','') - qs=self.REQUEST.SESSION['query'] - + for field in argv.keys(): + if field[0]=="_": + fieldTmp="-"+field[1:] + else: + fieldTmp=field + + qs+=",%s=%s"%(fieldTmp,argv[field]) + + + else: self.REQUEST['QUERY_STRING']=qs - + qs=string.join(qs.split("&"),",") @@ -344,12 +469,15 @@ class ZSQLExtendFolder(Persistent, Impli else: storename="foundCount" + #store query for further usage + self.REQUEST.SESSION['query']=qs - - 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): @@ -403,30 +531,92 @@ 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 ZSQLNewQuery(self,linkText,storename=None,**argv): + """suche neu""" + return self.ZSQLNewSearch(linkText,storename,url=self.REQUEST['URL'],args=argv) - def parseQueryString(self,qs,iCT,storemax="no",select=None,nostore=None,storename=None): + 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={} #Verknuepfung bei mehrfachauswahl von einem feld + sortfields={} #order of sortfields + sortAllFields=None 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: @@ -441,11 +631,30 @@ class ZSQLExtendFolder(Persistent, Impli field=name[4:] opfields[field]=op + + if name[0:4]==iCT+"lop": + lop=value + + field=name[5:] + lopfields[field]=lop + + if name[0:10]==iCT+"sortorder": + #sort=value + + field=name[11:] + sortAllFields=None + #no field selected + if field=="": + sortAllFields=value + else: + sortfields[field]=value + #print "HI",op,field #print opfieldsa #now analyse the querystring + for q in qs.split(","): - + #try: @@ -454,26 +663,42 @@ class ZSQLExtendFolder(Persistent, Impli value=urllib.unquote(q.split("=",1)[1]) except: value="" - - #value=libpq.PgQuoteString(value) + #value=sql_quote(value) + 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 + sortstrs=[] + for word in value.split(','): + wordstr=word.lstrip().rstrip() + if sortAllFields: + order=sortAllFields + else: + order=sortfields.get(wordstr,'ASC') + + if not (wordstr == ""): + 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 @@ -484,39 +709,81 @@ class ZSQLExtendFolder(Persistent, Impli elif (not name[0]==iCT) and (not len(value)==0): - + #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 "+sql_quote("%"+value+"%")) elif op=="gt": - whereList.append(name+">"+libpq.PgQuoteString(value)) + tmp=(name+">"+sql_quote(value)) elif op=="lt": - whereList.append(name+"<"+libpq.PgQuoteString(value)) + tmp=(name+"<"+sql_quote(value)) elif op=="eq": - whereList.append(name+"="+libpq.PgQuoteString(value)) + tmp=(name+"="+sql_quote(value)) elif op=="bw": - whereList.append(name+" LIKE "+libpq.PgQuoteString(value+"%")) + tmp=(name+" LIKE "+sql_quote(value+"%")) elif op=="ew": - whereList.append(name+" LIKE "+libpq.PgQuoteString("%"+value)) - op="ct" - - #except: - # print "END",value,name,Exception + tmp=(name+" LIKE "+sql_quote("%"+value)) + elif op=="all": + tmps=[] + for word in value.split(" "): + tmps.append(name+" LIKE "+sql_quote("%"+word+"%")) + + tmp=string.join(tmps,' AND ') + + elif op=="numerical": + term=analyseIntSearch(value) + tmp=(name+" "+term) + elif op=="grep": + tmp=(name+" ~* "+sql_quote(value)) + elif op=="one": + tmps=[] + for word in value.split(" "): + tmps.append(name+" LIKE "+sql_quote("%"+word+"%")) + + tmp=string.join(tmps,' OR ') + + op="all" + + if (not tableExt) or (namealt.split('.')[0]==tableExt): + if searchFields.has_key(namealt): + searchFields[namealt]+=lopfields.get(name,'OR')+" "+tmp + searchFieldsOnly[namealt]+=lopfields.get(name,'OR')+" "+value + else: + searchFields[namealt]=tmp + searchFieldsOnly[namealt]=value + + + 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 - + #print (select,table,where,sort,maxstr,skip) query="SELECT %s FROM %s %s %s %s %s"%(select,table,where,sort,maxstr,skip) if not nostore=="yes": @@ -524,23 +791,28 @@ 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]={} + + self.REQUEST.SESSION[storename]['qs']=qs #sichere Querystring + 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'] @@ -551,29 +823,61 @@ 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 - - #print "Q",query - return self.ZSQLQuery(query) + self.REQUEST.SESSION[storename]['searchFieldsOnly']=searchFieldsOnly + if not NoQuery: + + return self.ZSQLQuery(query) + else: + + return query + + def ZSQLUniqueQuery(self,value,returns): + """unique relation""" + if returns: + statement="""select %s from %s where %s = '%s' """%(returns[1],returns[0],returns[2],value) + founds=self.ZSQLSimpleSearch(statement) + if founds: + return getattr(founds[0],returns[1]) + else: + return value + else: + return value + def ZSQLQuery(self,query): """query""" - return self.search(var=query) + + return self.ZSQLSimpleSearch(query) + def ZSQLSearch(self): """To be done""" rq=self.REQUEST['QUERY_STRING'] + querys=rq.split("&") - + + formatfile=self.REQUEST['URL1'] #generisch redirect zur gleichen url + for querytemp in querys: query=querytemp.split("=") + + + + try: if query[0].lower()=="-format": 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)) @@ -587,40 +891,42 @@ 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"): """nextLink""" + try: limit=self.REQUEST.SESSION[storename]['rangeSize'] if int(limit)==0 : 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 if self.REQUEST['QUERY_STRING']=="": qs=self.REQUEST.SESSION['query'] - queries=string.split(qs,",") + queries=string.split(qs,",")[0:] else: qs=self.REQUEST['QUERY_STRING'] - queries=string.split(qs,"&") + queries=string.split(qs,"&")[0:] @@ -629,12 +935,11 @@ class ZSQLExtendFolder(Persistent, Impli skipFound=0 for query in queries: - print query - #print query.split("=")[0] - if query[0]=="_" : query[0]="-" - + + if query[0]=="_" : query="-"+query[1:] + if query.split("=")[0].lower()=="-skip": - print "d", newRangeStart + skipFound=1 query="-skip=%i"%newRangeStart newquery.append(query) @@ -644,20 +949,23 @@ class ZSQLExtendFolder(Persistent, Impli 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"): """prev link""" + try: limit=self.REQUEST.SESSION[storename]['rangeSize'] if int(limit)==0 : 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']) @@ -668,7 +976,7 @@ class ZSQLExtendFolder(Persistent, Impli 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,",") @@ -699,7 +1007,7 @@ class ZSQLExtendFolder(Persistent, Impli newquerystring=string.join(newquery,"&") - return "%s"%(self.actualPath()+"?"+newquerystring,html) + return "%s"%(self.REQUEST['URL']+"?"+newquerystring,html) @@ -766,6 +1074,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*. @@ -782,6 +1091,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 @@ -822,7 +1132,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() @@ -833,7 +1143,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() @@ -887,7 +1197,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 @@ -917,23 +1230,47 @@ 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(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() def getMetaDatasXML(self): """index""" + # check if the request's host part was OK + http_host = self.REQUEST['HTTP_HOST'] + host_port = self.REQUEST['SERVER_PORT'] + fix_host = None + if http_host and http_host.rfind(host_port) == -1: + print "HTTP_HOST needs fixing!" + fix_host = http_host + ":" + host_port + ret=""" """ - for found in self.search(var="select oid from %s"%self.tableName): - link=self.absolute_url()+"/"+"record.html?oid=%i"%found.oid - metalink=self.absolute_url()+"/"+"getMetaDataXML?oid=%i"%found.oid + for found in self.ZSQLSimpleSearch("select oid from %s limit ALL"%self.tableName): + base_url = self.absolute_url() + if fix_host: + #print "replacing ", http_host, " by ", fix_host + base_url = string.replace(base_url, http_host, fix_host, 1) + + link=base_url+"/"+"record.html?oid=%i"%found.oid + metalink=base_url+"/"+"getMetaDataXML?oid=%i"%found.oid ret+="""\n"""%(link,metalink) return ret+"\n" + manage_addZSQLBibliographyForm=DTMLFile('ZSQLBibliographyAdd', globals())