--- ZSQLExtend/ZSQLExtend.py 2004/03/10 15:06:53 1.13 +++ ZSQLExtend/ZSQLExtend.py 2004/11/27 22:41:43 1.50 @@ -1,23 +1,141 @@ 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 -def quoteString(name): - #return re.sub(r'([\(\)\?])',"\\\1",name) - #return "Euklid" - return name +from Products.ZSQLMethods.SQL import SQLConnectionIDs +import Shared.DC.ZRDB.DA -class ZSQLExtendFolder(Persistent, Implicit, Folder): +def analyseIntSearch(word): + #analyse integer searches + + 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 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""" + + try: + obj=getattr(self,"ZSQLBibliography_template") + return obj() + except: + 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() + + + def getWeight(self): + """getLabe""" + try: + return self.weight + except: + return "" + + def getLabel(self): + """getLabe""" + try: + return self.label + except: + return "" + + def getDescription(self): + """getLabe""" + try: + return self.description + except: + return "" + + manage_options=Folder.manage_options+( + {'label':'Main Config','action':'changeZSQLExtendForm'}, + ) + + def changeZSQLExtendForm(self): + """change folder config""" + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changeZSQLExtendForm.zpt')).__of__(self) + return pt() + + + 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 + + if REQUEST is not None: + return self.manage_main(self, REQUEST) + + def formatAscii(self,str,url=None): + """ersetze ascii umbrueche durch
""" + #url=None + if url and str: + + retStr="" + words=str.split("\n") + + for word in words: + strUrl=url%word + #print "str",strUrl + retStr+="""%s
"""%(strUrl,word) + str=retStr + if str: + return re.sub(r"[\n]","
",str) + else: + return "" + def getSAttribute(self,obj,atribute,pref=''): """get Attribute or emptystring""" @@ -75,9 +193,89 @@ class ZSQLExtendFolder(Persistent, Impli """%fieldname return ret + + def ZSQLSelectionFromCRList(self,fieldname,listField,boxType="checkbox",checked=None): + """generate select oprions form a cr seperated list""" + fields=listField.split("\n") + ret="" + for field in fields: + if checked and (field in checked.split("\n")): + ret+="""%s"""%(fieldname,boxType,field.encode('utf-8'),field.encode('utf-8')) + else: + ret+="""%s"""%(fieldname,boxType,field.encode('utf-8'),field.encode('utf-8')) + return ret + + + def ZSQLOptionsFromCRList(self,fieldname,listField, multiple=''): + """generate select oprions form a cr seperated list""" + fields=listField.split("\n") + ret="""""" + return ret + + 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,additionalSelect) + if start: + if start==' ': + start='' + if not startValue: + startValue=start + + ret+=""""""%(startValue,start) + for result in results: + field=getattr(result,fieldName) + fieldValue=getattr(result,valueName) + if fieldValue: + ret+=""""""%(field,fieldValue) + 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""" @@ -88,7 +286,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) @@ -97,11 +300,37 @@ class ZSQLExtendFolder(Persistent, Impli qs=[] - + #print "INLINE:",query + return self.ZSQLSimpleSearch(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) - return self.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'] @@ -122,17 +351,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=[] @@ -155,69 +384,99 @@ 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'],**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): + 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): + ret=[] + for x in list: + splitted=x.split("=") + 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]) + else: - qs=self.REQUEST.SESSION['query'] + qs=self.REQUEST.SESSION.get('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("&"),",") - + + qs=re.sub("\\+"," ",qs)# Austauschen da Leerzeichen bei http-get durch + ersetzt wird, generell sollte alles auf post umgeschrieben werden. vom search formular. + qs=string.join(delEmpty(qs.split(",")),",") + if storename: """store""" else: storename="foundCount" - #print "QS",qs - ret=self.parseQueryString(qs,"-",select=select,storemax="yes",storename=storename) + + #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): @@ -253,7 +512,7 @@ class ZSQLExtendFolder(Persistent, Impli else: storename="foundCount" - return self.REQUEST.SESSION[storename]['rangeStart'] + return int(self.REQUEST.SESSION[storename]['rangeStart'])+1 def ZSQLRangeSize(self,storename=None): @@ -271,41 +530,125 @@ 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 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): + 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: name=re.sub("r'+'"," ",q.split("=")[0].lower()) - value=urllib.unquote(q.split("=",1)[1]) - + try: + value=urllib.unquote(q.split("=",1)[1]) + except: + value="" + #print "Hi",name[0:3],q if name[0:3]==iCT+"op": op=value + 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(","): @@ -314,26 +657,46 @@ class ZSQLExtendFolder(Persistent, Impli #try: name=re.sub("r'+'"," ",q.split("=")[0].lower()) - value=urllib.unquote(q.split("=",1)[1]) - #value=libpq.PgQuoteString(value) + try: + value=urllib.unquote(q.split("=",1)[1]) + except: + 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 @@ -347,36 +710,77 @@ 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 "+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(name): + searchFields[name]+=lopfields.get(name,'OR')+" "+tmp + searchFieldsOnly[name]+=lopfields.get(name,'OR')+" "+value + else: + searchFields[name]=tmp + searchFieldsOnly[name]=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": @@ -384,23 +788,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'] @@ -411,26 +820,45 @@ 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.search(var=query) + self.REQUEST.SESSION[storename]['searchFieldsOnly']=searchFieldsOnly + if not NoQuery: + + return self.ZSQLQuery(query) + else: + + return query + + def ZSQLQuery(self,query): + """query""" + #print "hi",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("=") + + + print "fmtfile",formatfile + 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)) @@ -444,38 +872,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:] @@ -484,10 +916,11 @@ class ZSQLExtendFolder(Persistent, Impli skipFound=0 for query in queries: - #print query.split("=")[0] - if query[0]=="_" : query[0]="-" - + + if query[0]=="_" : query="-"+query[1:] + if query.split("=")[0].lower()=="-skip": + skipFound=1 query="-skip=%i"%newRangeStart newquery.append(query) @@ -497,18 +930,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']) @@ -519,7 +957,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,",") @@ -550,7 +988,7 @@ class ZSQLExtendFolder(Persistent, Impli newquerystring=string.join(newquery,"&") - return "%s"%(self.actualPath()+"?"+newquerystring,html) + return "%s"%(self.REQUEST['URL']+"?"+newquerystring,html) @@ -614,9 +1052,10 @@ class ZSQLExtendFolder(Persistent, Impli manage_addZSQLExtendFolderForm=DTMLFile('ZSQLExtendFolderAdd', globals()) -def manage_addZSQLExtendFolder(self, id, title='', +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*. @@ -631,7 +1070,212 @@ def manage_addZSQLExtendFolder(self, id, ob.title=title self._setObject(id, ob) ob=self._getOb(id) + setattr(ob,'label',label) + setattr(ob,'description',description) + setattr(ob,'connection_id',connection_id) + + checkPermission=getSecurityManager().checkPermission + if createUserF: + if not checkPermission('Add User Folders', ob): + raise Unauthorized, ( + 'You are not authorized to add User Folders.' + ) + ob.manage_addUserFolder() + + if createPublic: + if not checkPermission('Add Page Templates', ob): + raise Unauthorized, ( + 'You are not authorized to add Page Templates.' + ) + ob.manage_addProduct['PageTemplates'].manage_addPageTemplate( + id='index_html', title='') + + if REQUEST is not None: + return self.manage_main(self, REQUEST, update_menu=1) + + + +class ZSQLBibliography(Folder,ZSQLExtendFolder): + """Bibliography""" + meta_type="ZSQLBibliography" + def getLabel(self): + try: + return self.label + except: + return "" + + def getDescription(self): + try: + return self.description + except: + return "" + + def changeZSQLBibliographyForm(self): + """change folder config""" + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changeZSQLBibliographyForm.zpt')).__of__(self) + return pt() + + + def content_html(self): + """template fuer content""" + + try: + obj=getattr(self,"ZSQLBibliography_template") + return obj() + except: + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ZSQLBibliography_template_standard.zpt')).__of__(self) + pt.content_type="text/html" + return pt() + + def changeZSQLBibliography(self,tableName,label,description,REQUEST=None): + """change it""" + self.tableName=tableName + self.label=label + self.description=description + + if REQUEST is not None: + return self.manage_main(self, REQUEST) + + manage_options=Folder.manage_options+( + {'label':'Main Config','action':'changeZSQLBibliographyForm'}, + ) + + + def getFieldLabel(self,fields,field): + """get labels""" + try: + ret =fields[0][field] + if ret == "": + return field + else: + return ret + except: + return field + + def getFieldValue(self,found,field): + """get value""" + try: + ret=getattr(found,field) + if ret == "": + return None + else: + return ret + except: + return None + + def findTagsFromMapping(self,referenceType): + """gib hash mit label -> generic zurueck""" + self.referencetypes=self.ZopeFind(self.standardMD) + bibdata={} + retdata={} + fieldlist=self.standardMD.fieldList + + for referenceTypeF in self.referencetypes: + #print referenceType,referenceTypeF[1].title + if referenceTypeF[1].title == referenceType: + bibdata[referenceTypeF[1].title]=referenceTypeF[1].fields + bibdata['data']=referenceTypeF[1] + self.fields=bibdata[referenceType] + for field in fieldlist: + if referenceTypeF[1].getValue(field)[0]==None: + retdata[field]=field + else: + retdata[field]=referenceTypeF[1].getValue(field)[0] + + return retdata,fieldlist + + def findLabelsFromMapping(self,referenceType): + """gib hash mit label -> generic zurueck""" + self.referencetypes=self.ZopeFind(self.standardMD) + bibdata={} + retdata={} + fieldlist=self.standardMD.fieldList + + for referenceTypeF in self.referencetypes: + #print referenceType,referenceTypeF[1].title + if referenceTypeF[1].title == referenceType: + bibdata[referenceTypeF[1].title]=referenceTypeF[1].fields + bibdata['data']=referenceTypeF[1] + self.fields=bibdata[referenceType] + for field in fieldlist: + retdata[field]=referenceTypeF[1].getValue(field)[1] + + return retdata,fieldlist + + def createIndexTag(self,tag,content): + """creste tag""" + if content: + ret="""<%s>%s"""%(tag,content,tag) + return ret + 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(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.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()) + +def manage_addZSQLBibliography(self, id, tableName,label,description,title='', + createPublic=0, + createUserF=0, + REQUEST=None): + """Add a new Folder object with id *id*. + + If the 'createPublic' and 'createUserF' parameters are set to any true + value, an 'index_html' and a 'UserFolder' objects are created respectively + in the new folder. + """ + + + ob=ZSQLBibliography() + ob.id=str(id) + ob.title=title + self._setObject(id, ob) + ob=self._getOb(id) + setattr(ob,'tableName',tableName) + setattr(ob,'label',label) + setattr(ob,'description',description) + checkPermission=getSecurityManager().checkPermission if createUserF: @@ -653,3 +1297,5 @@ def manage_addZSQLExtendFolder(self, id, return self.manage_main(self, REQUEST, update_menu=1) + +