--- ZSQLExtend/ZSQLExtend.py 2006/09/17 10:05:03 1.94 +++ ZSQLExtend/ZSQLExtend.py 2007/04/02 09:48:13 1.107 @@ -1,4 +1,3 @@ - from OFS.Folder import Folder from Acquisition import Implicit from Globals import DTMLFile,package_home,Persistent @@ -15,11 +14,19 @@ from Products.ZSQLMethods.SQL import SQL from xml.sax.saxutils import escape from types import * import Shared.DC.ZRDB.DA -import zLOG +import logging import os.path import os import copy import unicodedata +import tempfile +import logging + +#ersetzt logging +def logger(txt,method,txt2): + """logging""" + logging.info(txt+ txt2) + from OFS.SimpleItem import SimpleItem @@ -63,6 +70,9 @@ def sql_quote(v): def showSQLConnectionIDs(self): return SQLConnectionIDs(self) +class Options: + """options class""" + class ZSQLIndex(SimpleItem): """index""" meta_type="ZSQLIndex" @@ -162,7 +172,7 @@ class ZSQLExtendFolder(Folder,Persistent #from xml.dom.minidom import parseString,parse from Ft.Xml import Parse - zLOG.LOG("import xsd",zLOG.INFO,"called") + logger("import xsd",logging.INFO,"called") #fh=file("/tmp/fmpxml.xml") import bz2 import base64 @@ -172,16 +182,16 @@ class ZSQLExtendFolder(Folder,Persistent if data: data=bz2.decompress(base64.decodestring(data)) - #zLOG.LOG("import xsd",zLOG.INFO,"received file") + #logger("import xsd",logging.INFO,"received file") doc=Parse(data) - #zLOG.LOG("import xsd",zLOG.INFO,"parsed file") + #logger("import xsd",logging.INFO,"parsed file") elif filename: fh=file(filename) txt=fh.read() doc=Parse(txt) - #zLOG.LOG("import xsd",zLOG.INFO,"parsed file") + #logger("import xsd",logging.INFO,"parsed file") Nss={'xsd':'http://www.w3.org/2001/XMLSchema'} @@ -200,7 +210,7 @@ class ZSQLExtendFolder(Folder,Persistent else: create=False - zLOG.LOG("update xsd: fieldnames",zLOG.INFO,repr(fieldNames)) + logger("update xsd: fieldnames",logging.INFO,repr(fieldNames)) qstr="""select attname from pg_attribute, pg_class where attrelid = pg_class.oid and relname = '%s' """ columns=[x.attname for x in self.ZSQLSimpleSearch(qstr%table)] @@ -215,7 +225,7 @@ class ZSQLExtendFolder(Folder,Persistent for fieldName in fieldNames: if type(fieldName) is UnicodeType: fieldName=fieldName.encode('utf-8') - zLOG.LOG("update xml: fieldname",zLOG.INFO,repr(fieldName)) + logging.info("update xml: fieldname",logging.INFO,repr(fieldName)) if fieldName.lower() not in columns: if create:# table does not exist therefore create with one column @@ -225,7 +235,7 @@ class ZSQLExtendFolder(Folder,Persistent qstr="""alter table %s add %s %s""" self.ZSQLSimpleSearch(qstr%(table,fieldName,'text')) - zLOG.LOG("update xsd: fieldname add",zLOG.INFO,qstr%(table,fieldName,'text')) + logger("update xsd: fieldname add",logging.INFO,qstr%(table,fieldName,'text')) def importXMLFileAccess(self,table,container,data=None,identify=None,filename=None,RESPONSE=None): @@ -239,7 +249,7 @@ class ZSQLExtendFolder(Folder,Persistent ''' from xml.dom.pulldom import parseString,parse - zLOG.LOG("import xml",zLOG.INFO,"called") + logger("import xml",logging.INFO,"called") #fh=file("/tmp/fmpxml.xml") import bz2 import base64 @@ -248,14 +258,14 @@ class ZSQLExtendFolder(Folder,Persistent if data: data=bz2.decompress(base64.decodestring(data)) - zLOG.LOG("import xml",zLOG.INFO,"received file") + logger("import xml",logging.INFO,"received file") doc=parseString(data) - zLOG.LOG("import xml",zLOG.INFO,"parsed file") + logger("import xml",logging.INFO,"parsed file") elif filename: fh=file(filename) doc=parse(fh) - zLOG.LOG("import xml",zLOG.INFO,"parsed file") + logger("import xml",logging.INFO,"parsed file") while 1: node=doc.getEvent() @@ -278,7 +288,7 @@ class ZSQLExtendFolder(Folder,Persistent field=dataSet[identify] searchStr="""select %s from %s where %s = '%s'"""%(identify,table,identify,field) - zLOG.LOG("import xml",zLOG.INFO,searchStr) + logger("import xml",logging.INFO,searchStr) search=self.ZSQLSimpleSearch(searchStr) if search: update=True @@ -292,7 +302,7 @@ class ZSQLExtendFolder(Folder,Persistent field=dataSet[identify] queryStr="""UPDATE %s SET %s WHERE %s = '%s' """%(table,setStr,identify,field) - zLOG.LOG("update xml",zLOG.INFO,queryStr) + logger("update xml",logging.INFO,queryStr) self.ZSQLSimpleSearch(queryStr) ret+="ud: %s \n"%field else: @@ -304,7 +314,7 @@ class ZSQLExtendFolder(Folder,Persistent queryStr="""INSERT INTO %s (%s) VALUES (%s)"""%(table,fields,values) self.ZSQLSimpleSearch(queryStr) - zLOG.LOG("update xml",zLOG.INFO,queryStr) + logger("update xml",logging.INFO,queryStr) @@ -333,12 +343,113 @@ class ZSQLExtendFolder(Folder,Persistent else: if node[1].nodeName==containerTagName: doc.expandNode(node[1]) + cols=node[1].getElementsByTagName('COL') + dataSet=[] + for col in cols: + data=col.getElementsByTagName('DATA') + dataSet.append(getTextFromNode(data[0])) + update=False + if identify: + + nr=fieldNames.index(identify) + field=dataSet[nr] + + searchStr="""select %s from %s where %s = '%s'"""%(identify,table,identify,field) + logger("import xml",logging.INFO,searchStr) + search=self.ZSQLSimpleSearch(searchStr) + if search: + update=True + + if update: + tmp=[] + for fieldName in fieldNames: + tmp.append("""%s = %s"""%(fieldName,self.ZSQLQuote(dataSet[fieldNames.index(fieldName)]))) + setStr=",".join(tmp) + nr=fieldNames.index(identify) + field=dataSet[nr] + + queryStr="""UPDATE %s SET %s WHERE %s = '%s' """%(table,setStr,identify,field) + logger("update xml",logging.INFO,queryStr) + self.ZSQLSimpleSearch(queryStr) + ret+="ud: %s \n"%field + else: + + + fields=",".join(fieldNames) + values=",".join([""" %s """%self.ZSQLQuote(x) for x in dataSet]) + + + queryStr="""INSERT INTO %s (%s) VALUES (%s)"""%(table,fields,values) + self.ZSQLSimpleSearch(queryStr) + logger("update xml",logging.INFO,queryStr) + ret+="ad: %s \n"%field + + elif node[1].nodeName=="METADATA": + fieldNames=[] + doc.expandNode(node[1]) + + names=node[1].getElementsByTagName('FIELD') + + for name in names: + fieldNames.append(name.getAttribute('NAME')) + + logger("update xml: fieldnames",logging.INFO,repr(fieldNames)) + qstr="""select attname from pg_attribute, pg_class where attrelid = pg_class.oid and relname = '%s' """ + columns=[x.attname for x in self.ZSQLSimpleSearch(qstr%table)] + + for fieldName in fieldNames: + logger("update xml: fieldname",logging.INFO,repr(fieldName)) + if fieldName not in columns: + qstr="""alter table %s add %s %s""" + self.ZSQLSimpleSearch(qstr%(table,fieldName,'text')) + logger("update xml: fieldname add",logging.INFO,qstr%(table,fieldName,'text')) #fn=node[1].getAttribute("xml:id") #nf=file("xtf/"+fn+".xtf",'w') #nf.write(""""""+node[1].toxml()+"") #print "wrote: %s"%fn - + + + def importXMLFileFMP(self,table,dsn=None,uploadfile=None,update_fields=None,id_field=None,sync_mode=False,replace=False,redirect_url=None,RESPONSE=None): + ''' + Import FileMaker XML file (FMPXMLRESULT format) into the table. + @param dsn: database connection string + @param table: name of the table the xml shall be imported into + @param uploadfile: xmlfile file + @param update_fields: (optional) list of fields to update; default is to create all fields + @param id_field: (optional) field which uniquely identifies an entry for updating purposes. + @param sync_mode: (optional) really synchronise, i.e. delete entries not in XML file + @param RESPONSE: (optional) + @param redirect_url: (optional) url for redirecting after the upload is done + ''' + tfilehd,filename=tempfile.mkstemp() + tfile=os.fdopen(tfilehd,'w') + logging.error("import %s"%uploadfile) + for c in uploadfile.read(): + tfile.write(c) + tfile.close() + + from importFMPXML import importFMPXML + + if not dsn: + dsn=self.getConnectionObj().connection_string + + options=Options() + options.dsn=dsn + options.table=table + options.filename=filename + options.update_fields=update_fields + options.id_field=id_field + options.sync_mode=sync_mode + options.replace_table=replace + options.lc_names=True + importFMPXML(options) + + os.remove(filename) + + if RESPONSE and redirect_url: + RESPONSE.redirect(redirect_url) + def generateIndex(self,field,index_name,table,RESPONSE=None): """erzeuge index aus feld""" index={} @@ -507,7 +618,7 @@ class ZSQLExtendFolder(Folder,Persistent #print "field",field if not field: return 1 - if field=="": + if field.strip()=="": return 1 return 0 @@ -574,7 +685,12 @@ class ZSQLExtendFolder(Folder,Persistent ret+="""""" return ret - def ZSQLOptionsFromSearchList(self,fieldname,results,fieldName,valueName=None,start=None, multiple='',startValue=None,additionalSelect="",size=None,linelen=None,selected=None): + def ZSQLOptionsFromSearchList(self,fieldname, + results,fieldName, + valueName=None,start=None, + multiple='',startValue=None, + additionalSelect="",size=None, + linelen=None,selected=None): """generate select options form a search list es wird """ return ret @@ -645,7 +763,8 @@ class ZSQLExtendFolder(Folder,Persistent #print "INLINE:",argv for a in argTmp.keys(): - qs.append(a+"="+urllib.quote(str(argTmp[a]))) + aFiltered=re.sub(r"^-","_",a) # beginning of a command should always be "_" + qs.append(aFiltered+"="+urllib.quote(str(argTmp[a]))) #return [] ret = self.parseQueryString(string.join(qs,","),"_",storename=storename) @@ -674,9 +793,11 @@ class ZSQLExtendFolder(Folder,Persistent ret[field[0]]=(self.ZSQLInlineSearch(storename=storename,args=argTmp2),field[3],field[4],field[5],field[6]) return ret + + def ZSQLInlineSearch(self,storename=None,args=None,**argv): """inlinesearch""" - + qs=[] if storename: """store""" @@ -693,11 +814,18 @@ class ZSQLExtendFolder(Folder,Persistent #print "INLINE:",argv for a in argTmp.keys(): - try: - qs.append(a+"="+urllib.quote(str(argTmp[a]))) - except: - import urllib - qs.append(a+"="+urllib.quote(str(argTmp[a]))) + aFiltered=re.sub(r"^-","_",a) # beginning of a command should always be "_" + + if type(argTmp[a]) is ListType: # ein parameter zweimal + value="" + #TODO find a better solution, currently only the last non empty entry is used. + for x in argTmp[a]: + if x: + value=x + else: + value=str(argTmp[a]) + qs.append(aFiltered+"="+urllib.quote(value)) + #return [] @@ -716,11 +844,11 @@ class ZSQLExtendFolder(Folder,Persistent try: self.getConnectionObj().manage_close_connection() except: - zLOG.LOG("ZSQLResetConnection",zLOG.ERROR, '%s %s'%sys.exc_info()[:2]) + logger("ZSQLResetConnection",logging.ERROR, '%s %s'%sys.exc_info()[:2]) try: self.getConnectionObj().manage_open_connection() except: - zLOG.LOG("ZSQLResetConnection",zLOG.ERROR, '%s %s'%sys.exc_info()[:2]) + logger("ZSQLResetConnection",logging.ERROR, '%s %s'%sys.exc_info()[:2]) def ZSQLSimpleSearch(self,query=None,max_rows=1000000): """simple search""" @@ -743,7 +871,7 @@ class ZSQLExtendFolder(Folder,Persistent try: self.getConnectionObj().manage_open_connection() except: - zLOG.LOG("ZSQLSimpleSearch",zLOG.ERROR, '%s %s'%sys.exc_info()[:2]) + logger("ZSQLSimpleSearch",logging.ERROR, '%s %s'%sys.exc_info()[:2]) else: try: @@ -756,7 +884,7 @@ class ZSQLExtendFolder(Folder,Persistent try: self.getConnectionObj().manage_open_connection() except: - zLOG.LOG("ZSQLSimpleSearch",zLOG.ERROR, '%s %s'%sys.exc_info()[:2]) + logger("ZSQLSimpleSearch",logging.ERROR, '%s %s'%sys.exc_info()[:2]) def getConnectionObj(self): if hasattr(self,'connection_id'): @@ -844,7 +972,7 @@ class ZSQLExtendFolder(Folder,Persistent else: return True - def ZSQLChange(self,format=None,RESPONSE=None,USE_FORM=None,**argv): + def ZSQLChange(self,format=None,RESPONSE=None,USE_FORM=None,args=None,**argv): """change entries""" #qs=self.REQUEST['QUERY_STRING'] # very bad hack @@ -856,19 +984,23 @@ class ZSQLExtendFolder(Folder,Persistent qs_temp.append(a+"="+urllib.quote(str(self.REQUEST.form[a]))) - - for field in argv.keys(): + if args: + arg_tmp=args + else: + arg_tmp=argv + + for field in arg_tmp.keys(): if field[0]=="_": fieldTmp="-"+field[1:] else: fieldTmp=field - qs_temp.append("%s=%s"%(fieldTmp,argv[field])) + qs_temp.append("%s=%s"%(fieldTmp,arg_tmp[field])) changeList=[] - + logging.info("ZSQLChange qs_temp: %s"%repr(qs_temp)) for q in qs_temp: name=urllib.unquote(re.sub("r'+'"," ",q.split("=")[0].lower())) @@ -886,12 +1018,15 @@ class ZSQLExtendFolder(Folder,Persistent #elif (not (name[0]=="-" or name[0]=="_")) and (not len(value)==0): elif (not (name[0]=="-" or name[0]=="_")): - changeList.append("\""+name+"\"="+sql_quote(urllib.unquote(value))) + if value=="": + changeList.append("\""+name+"\"=null") + else: + changeList.append("\""+name+"\"="+sql_quote(urllib.unquote(value))) changeString=string.join(changeList,",") queryString="UPDATE %s SET %s WHERE %s"%(table,changeString,identify) - zLOG.LOG("ZSQLExtend",zLOG.INFO,"CHANGE: "+queryString) + logger("ZSQLExtend",logging.INFO,"CHANGE: "+queryString) self.ZSQLSimpleSearch(queryString) @@ -925,7 +1060,7 @@ class ZSQLExtendFolder(Folder,Persistent - def ZSQLFind(self,qs="",select="oid,*",storename=None,tableExt=None,NoQuery=None,NoLimit=None,restrictField=None,restrictConnect=None,filter=None,**argv): + def ZSQLFind(self,qs="",select="oid,*",storename="foundCount",tableExt=None,NoQuery=None,NoLimit=None,restrictField=None,restrictConnect=None,filter=None,**argv): """search in database""" def delEmpty(list): @@ -977,130 +1112,94 @@ class ZSQLExtendFolder(Folder,Persistent qs=string.join(delEmpty(qs.split(",")),",") - if storename: - """store""" - else: - storename="foundCount" #store query for further usage + #TODO: erste der beiden ist ueberfluessig self.REQUEST.SESSION['query']=qs - + if not self.REQUEST.SESSION.has_key(storename): + self.REQUEST.SESSION[storename]={} + + self.REQUEST.SESSION[storename]['qs']=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): return len(var) - def ZSQLFoundCount(self,qs="",select="*",storename=None): - - ## if qs=="": - -## if self.REQUEST['QUERY_STRING']: - -## qs=self.REQUEST['QUERY_STRING'] -## qs=string.join(qs.split("&"),",") -## else: - -## qs=self.REQUEST.SESSION['query'] -## else: -## qs=string.join(qs.split("&"),",") - - -## temp= self.parseQueryString(qs,"-",select=select,storemax="yes",nostore="yes") - if storename: - """store""" - else: - storename="foundCount" - + def ZSQLFoundCount(self,qs="",select="*",storename="foundCount"): + return self.REQUEST.SESSION[storename]['count'] - def ZSQLRangeStart(self,storename=None): - - if storename: - """store""" - else: - storename="foundCount" - + def ZSQLRangeStart(self,storename="foundCount"): + return int(self.REQUEST.SESSION[storename]['rangeStart'])+1 - def ZSQLRangeSize(self,storename=None): + def ZSQLRangeSize(self,storename="foundCount"): - if storename: - """store""" - else: - storename="foundCount" - return self.REQUEST.SESSION[storename]['rangeSize'] - def ZSQLRangeEnd(self,storename=None): - - if storename: - """store""" - else: - storename="foundCount" - + def ZSQLRangeEnd(self,storename="foundCount"): + return str(min(int(self.REQUEST.SESSION[storename]['rangeEnd']),int(self.REQUEST.SESSION[storename]['count']))) - def ZSQLNewQuery(self,linkText,storename=None,**argv): + def ZSQLNewQuery(self,linkText,storename="foundCount",**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): + def ZSQLNewSearch(self,linkText,storename="foundCount",url=None,args=None,**argv): """suche mit alten parametern bis auf die in argv getauschten""" + str = self.ZSQLNewSearchURL(storename, url, args, **argv) + return """ %s"""%(str,linkText) + - if storename: - """store""" - else: - storename="foundCount" - qs=self.REQUEST.SESSION[storename]['qs'] - + def ZSQLNewSearchURL(self, storename="foundCount",url=None,args=None,**argv): + """suche mit alten parametern bis auf die in argv getauschten""" if args: argv=args - + + #get the old queries + qs=self.REQUEST.SESSION[storename]['qs'] querys=qs.split(",") + + #which arguments are in the old query string + + queryList={} + for query in querys: + arg=query.split("=")[0] + if arg[0]=="_": arg="-"+arg[1:] # sicherstellen, dass an Anfang stets "_" + queryList[arg]=query.split("=")[1] + + argList=[] arg="" - queryList=[x.split("=")[0] for x in querys] + + + #gehe durch die zu aendernden Argumente 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) + arg=argTmp[0:]# sicherstellen, dass der string auh kopiert wird + if arg[0]=="_": arg="-"+arg[1:] # sicherstellen, dass an Anfang stets "_" - - - 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) + queryList[arg]=argv[argTmp] if url: - str=url+"?"+"&".join(newquery) + str=url+"?"+urllib.urlencode(queryList) else: - str="ZSQLSearch?"+"&".join(newquery) + str="ZSQLSearch?"+urllib.urlencode(queryList) - return """ %s"""%(str,linkText) + return str - 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): + def parseQueryString(self,qs,iCT,storemax="no",select=None,nostore=None,storename="foundCount",tableExt=None,NoQuery=None,NoLimit=None,restrictField=None,restrictConnect=None,filter=None): """analysieren den QueryString""" - - + + #setzte generische werte lop="AND" # standardsuche mit and @@ -1120,6 +1219,8 @@ class ZSQLExtendFolder(Folder,Persistent searchFields={} searchFieldsOnly={} queryTemplate=[] + outerjoin="" + debug=None if not select: select="oid,*" @@ -1136,8 +1237,11 @@ class ZSQLExtendFolder(Folder,Persistent #erster durchgang suche operatoren for q in splitted: - + name=re.sub("r'+'"," ",q.split("=")[0].lower()) + if name=="_debug": + debug=True + try: value=urllib.unquote(q.split("=",1)[1]) except: @@ -1176,8 +1280,10 @@ class ZSQLExtendFolder(Folder,Persistent name=re.sub("r'+'"," ",q.split("=")[0].lower()) + try: value=urllib.unquote(q.split("=",1)[1]) + except: value="" @@ -1188,7 +1294,7 @@ class ZSQLExtendFolder(Folder,Persistent if diacritics.get(name,'yes')=='no': """filter diacritische zeichen""" value=unicodedata.normalize('NFKD', value.decode('utf-8')).encode('ASCII', 'ignore') - + if name==iCT+"lop": lop=value elif name==iCT+"table": @@ -1205,9 +1311,14 @@ class ZSQLExtendFolder(Folder,Persistent skip="OFFSET "+str(value) rangeStart=str(value) elif name==iCT+"join": + whereList.append(value) + elif name==iCT+"outerjoin": + + outerjoin=value elif name==iCT+"sort": sortstrs=[] + for word in value.split(','): wordstr=word.lstrip().rstrip() if sortAllFields: @@ -1233,9 +1344,9 @@ class ZSQLExtendFolder(Folder,Persistent #TABELLE.SUCHFELD_IN_DIESER_TABELLE.SELECT_FIELD.IDENTIFIER_IN_TABELLE_-table #i.e. erzeugt wird #das Statement - #WHERE DENTIFIER_IN_TABELLE_-table in (select from SELECT_FIELD - #where LOWER(UCHFELD_IN_DIESER_TABELLE) something value) - #something is defined by _op_TABELLE.SUCHFELD_IN_DIESER_TABELLE.SELECT_FIELD.IDENTIFIER_IN_TABELLE_-table + #WHERE IDENTIFIER_IN_TABELLE in (select * from SELECT_FIELD + #where LOWER(SUCHFELD_IN_DIESER_TABELLE) something value) + #something is defined by _op_TABELLE.SUCHFELD_IN_DIESER_TABELLE.SELECT_FIELD.IDENTIFIER_IN_TABELLE elif (not name[0]==iCT) and len(punktsplit)==4: if opfields.has_key(name): @@ -1287,6 +1398,7 @@ class ZSQLExtendFolder(Folder,Persistent #print "OP",op,name value=value.lower() + tmp="" if opfields.has_key(name): op=opfields[name] @@ -1360,14 +1472,14 @@ class ZSQLExtendFolder(Folder,Persistent #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) + query="SELECT %s FROM %s %s %s %s %s %s"%(select,table,outerjoin,where,sort,maxstr,skip) if not nostore=="yes": self.REQUEST.SESSION['qs']=opfields #print "IAMHERE again:", query - if storename and (not NoQuery): + if not NoQuery: query2="SELECT count(*) FROM %s %s"%(table,where) @@ -1376,9 +1488,9 @@ class ZSQLExtendFolder(Folder,Persistent 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: #print "HOOOOO",storename self.REQUEST.SESSION[storename]['queryString2']=query2 @@ -1389,9 +1501,10 @@ class ZSQLExtendFolder(Folder,Persistent #print "QUERY",query2,"::::",self.REQUEST.SESSION[storename]['queryString2'] else: - + self.REQUEST.SESSION[storename]['queryString2']=query2 if self.ZSQLSimpleSearch(query2): + self.REQUEST.SESSION[storename]['count']=self.ZSQLSimpleSearch(query2)[0].count else: self.REQUEST.SESSION[storename]['count']=0 @@ -1399,7 +1512,11 @@ class ZSQLExtendFolder(Folder,Persistent self.REQUEST.SESSION[storename]['rangeStart']=rangeStart - if limit=="all": + + + self.REQUEST.SESSION[storename]['rangeEnd']=self.REQUEST.SESSION[storename]['count'] + + if (limit=="all") or (limit==int(limit)): self.REQUEST.SESSION[storename]['rangeEnd']=self.REQUEST.SESSION[storename]['count'] else: self.REQUEST.SESSION[storename]['rangeEnd']=int(rangeStart)+int(limit) @@ -1407,9 +1524,11 @@ class ZSQLExtendFolder(Folder,Persistent self.REQUEST.SESSION[storename]['searchFields']=searchFields self.REQUEST.SESSION[storename]['searchFieldsOnly']=searchFieldsOnly - + + if debug: + logging.error("ZSQLSimpleSearch %s"%query) if not NoQuery: - + return self.ZSQLQuery(query) else: @@ -1430,8 +1549,8 @@ class ZSQLExtendFolder(Folder,Persistent def ZSQLQuery(self,query,debug=None): """query""" if debug: - zLOG.LOG("ZSQLQuery", zLOG.INFO, query) - + logger("ZSQLQuery", logging.INFO, query) + return self.ZSQLSimpleSearch(query) @@ -1458,7 +1577,7 @@ class ZSQLExtendFolder(Folder,Persistent 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)) + return self.REQUEST.RESPONSE.redirect(urllib.unquote(formatfile)+"?"+rq) def ZSQLint(self,string): @@ -1492,7 +1611,7 @@ class ZSQLExtendFolder(Folder,Persistent limit=1 newRangeStart=0 - if newRangeStart>=self.REQUEST.SESSION[storename]['count']: + if (newRangeStart>=self.REQUEST.SESSION[storename]['count']) or (self.REQUEST.SESSION[storename]['count']==self.REQUEST.SESSION[storename]['rangeEnd']): #newRangeStart=self.REQUEST.SESSION[storename]['count']-1 return "" @@ -1591,64 +1710,7 @@ class ZSQLExtendFolder(Folder,Persistent - def prevLink_old(self,html): - """prev link""" - if self.REQUEST['QUERY_STRING']=="": - qs=self.REQUEST.SESSION['query'] - else: - qs=self.REQUEST['QUERY_STRING'] - max=re.search(r'max\=(.*)\,',qs.lower()) - offset=re.search(r'offset\=(.*)\,',qs.lower()) - if not offset: - offsetnew=0 - else: - offsetnew=int(offset)-max - if offsetnew<0: - offsetnew=0 - queries=string.split(qs,",") - newquery=[] - if offset: - for query in queries: - if query.split("=")[0].lower()=="offset": - query="-offset=%i"%offsetnew - newquery.append(query) - newquerystring=string.join(newquery,"&") - else: - queries.append("-offset=%i"%offsetnew) - newquerystring=string.join(queries,"&") - return "%s"%(self.actualPath()+"?"+newquerystring,html) - - def nextLink_old(self,html): - """prev link""" - if self.REQUEST['QUERY_STRING']=="": - qs=self.REQUEST.SESSION['query'] - else: - qs=self.REQUEST['QUERY_STRING'] - max=re.search(r'max\=(.*)\,',qs.lower()) - - offset=re.search(r'offset\=(.*)\,',qs.lower()) - if not offset: - offsetnew=1 - else: - offsetnew=int(offset)+int(max) - if offsetnew<0: - offsetnew=0 - queries=string.split(qs,",") - newquery=[] - if offset: - for query in queries: - - if query.split("=")[0].lower()=="-offset": - query="-offset=%i"%offsetnew - newquery.append(query) - newquerystring=string.join(newquery,"&") - else: - queries.append("-offset=%i"%offsetnew) - newquerystring=string.join(queries,"&") - - return "%s"%(self.actualPath()+"?"+newquerystring,html) - - + manage_addZSQLExtendFolderForm=DTMLFile('ZSQLExtendFolderAdd', globals()) def manage_addZSQLExtendFolder(self, id, title='', label='', description='',