version 1.102, 2007/02/09 17:39:44
|
version 1.106, 2007/03/08 17:00:48
|
Line 424 class ZSQLExtendFolder(Folder,Persistent
|
Line 424 class ZSQLExtendFolder(Folder,Persistent
|
|
|
if data: |
if data: |
data=bz2.decompress(base64.decodestring(data)) |
data=bz2.decompress(base64.decodestring(data)) |
zLOG.LOG("fmpxml",zLOG.INFO,"received file") |
logger("fmpxml",logging.INFO,"received file") |
doc=parseString(data) |
doc=parseString(data) |
zLOG.LOG("fmpxml",zLOG.INFO,"parsed file") |
logger("fmpxml",logging.INFO,"parsed file") |
|
|
elif filename: |
elif filename: |
fh=file(filename) |
fh=file(filename) |
zLOG.LOG("fmpxml",zLOG.INFO,"reading file") |
logger("fmpxml",logging.INFO,"reading file") |
doc=parse(fh) |
doc=parse(fh) |
zLOG.LOG("fmpxml",zLOG.INFO,"parsed file") |
logger("fmpxml",logging.INFO,"parsed file") |
|
|
dbIDs = {} |
dbIDs = {} |
rowcnt = 0 |
rowcnt = 0 |
Line 445 class ZSQLExtendFolder(Folder,Persistent
|
Line 445 class ZSQLExtendFolder(Folder,Persistent
|
dbIDs[id[0]] = 0; |
dbIDs[id[0]] = 0; |
rowcnt += 1 |
rowcnt += 1 |
|
|
zLOG.LOG("fmpxml",zLOG.INFO,"%d entries in DB to sync"%rowcnt) |
logger("fmpxml",logging.INFO,"%d entries in DB to sync"%rowcnt) |
|
|
fieldNames = [] |
fieldNames = [] |
rowcnt = 0 |
rowcnt = 0 |
Line 471 class ZSQLExtendFolder(Folder,Persistent
|
Line 471 class ZSQLExtendFolder(Folder,Persistent
|
# update all fields |
# update all fields |
update_fields = fieldNames |
update_fields = fieldNames |
|
|
zLOG.LOG("fmpxml fieldnames:",zLOG.INFO,repr(fieldNames)) |
logger("fmpxml fieldnames:",logging.INFO,repr(fieldNames)) |
# get list of fields in db table |
# get list of fields in db table |
qstr="""select attname from pg_attribute, pg_class where attrelid = pg_class.oid and relname = '%s'""" |
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)] |
columns=[x.attname for x in self.ZSQLSimpleSearch(qstr%table)] |
|
|
# adjust db table to fields in XML and fieldlist |
# adjust db table to fields in XML and fieldlist |
for fieldName in fieldNames: |
for fieldName in fieldNames: |
zLOG.LOG("fmpxml fieldname:",zLOG.INFO,repr(fieldName)) |
logger("fmpxml fieldname:",logging.INFO,repr(fieldName)) |
if (fieldName not in columns) and (fieldName in update_fields): |
if (fieldName not in columns) and (fieldName in update_fields): |
qstr="""alter table %s add %s %s""" |
qstr="""alter table %s add %s %s""" |
self.ZSQLSimpleSearch(qstr%(table,fieldName,'text')) |
self.ZSQLSimpleSearch(qstr%(table,fieldName,'text')) |
zLOG.LOG("fmpxml add field:",zLOG.INFO,qstr%(table,fieldName,'text')) |
logger("fmpxml add field:",logging.INFO,qstr%(table,fieldName,'text')) |
|
|
# ROW tags (in RESULTSET tag) hold data |
# ROW tags (in RESULTSET tag) hold data |
elif node[1].nodeName == 'ROW': |
elif node[1].nodeName == 'ROW': |
Line 515 class ZSQLExtendFolder(Folder,Persistent
|
Line 515 class ZSQLExtendFolder(Folder,Persistent
|
setStr=string.join(setvals, ',') |
setStr=string.join(setvals, ',') |
id_val=dataSet[id_field] |
id_val=dataSet[id_field] |
qstr="""UPDATE %s SET %s WHERE %s = '%s' """%(table,setStr,id_field,id_val) |
qstr="""UPDATE %s SET %s WHERE %s = '%s' """%(table,setStr,id_field,id_val) |
#zLOG.LOG("fmpxml update:",zLOG.INFO,queryStr) |
#logger("fmpxml update:",logging.INFO,queryStr) |
self.ZSQLSimpleSearch(qstr) |
self.ZSQLSimpleSearch(qstr) |
ret+="up: %s \n"%id_val |
ret+="up: %s \n"%id_val |
else: |
else: |
Line 524 class ZSQLExtendFolder(Folder,Persistent
|
Line 524 class ZSQLExtendFolder(Folder,Persistent
|
values=string.join([" %s "%self.ZSQLQuote(dataSet[x]) for x in update_fields], ',') |
values=string.join([" %s "%self.ZSQLQuote(dataSet[x]) for x in update_fields], ',') |
qstr="""INSERT INTO %s (%s) VALUES (%s)"""%(table,fields,values) |
qstr="""INSERT INTO %s (%s) VALUES (%s)"""%(table,fields,values) |
self.ZSQLSimpleSearch(qstr) |
self.ZSQLSimpleSearch(qstr) |
#zLOG.LOG("fmpxml: insert",zLOG.INFO,queryStr) |
#logger("fmpxml: insert",logging.INFO,queryStr) |
ret+="ad: %s \n"%dataSet.get(id_field, rowcnt) |
ret+="ad: %s \n"%dataSet.get(id_field, rowcnt) |
|
|
#zLOG.LOG("fmpxml row:",zLOG.INFO,"%d (%s)"%(rowcnt,id_val)) |
#logger("fmpxml row:",logging.INFO,"%d (%s)"%(rowcnt,id_val)) |
if (rowcnt % 10) == 0: |
if (rowcnt % 10) == 0: |
zLOG.LOG("fmpxml row:",zLOG.INFO,"%d (%s)"%(rowcnt,id_val)) |
logger("fmpxml row:",logging.INFO,"%d (%s)"%(rowcnt,id_val)) |
transaction.commit() |
transaction.commit() |
|
|
transaction.commit() |
transaction.commit() |
Line 538 class ZSQLExtendFolder(Folder,Persistent
|
Line 538 class ZSQLExtendFolder(Folder,Persistent
|
for id in dbIDs.keys(): |
for id in dbIDs.keys(): |
# find all not-updated fields |
# find all not-updated fields |
if dbIDs[id] == 0: |
if dbIDs[id] == 0: |
zLOG.LOG("fmpxml delete:",zLOG.INFO,id) |
logger("fmpxml delete:",logging.INFO,id) |
qstr = "DELETE FROM %s WHERE %s = '%s'" |
qstr = "DELETE FROM %s WHERE %s = '%s'" |
self.ZSQLSimpleSearch(qstr%(table,id_field,id)) |
self.ZSQLSimpleSearch(qstr%(table,id_field,id)) |
|
|
elif dbIDs[id] > 1: |
elif dbIDs[id] > 1: |
zLOG.LOG("fmpxml sync:",zLOG.INFO,"id used more than once?"+id) |
logger("fmpxml sync:",logging.INFO,"id used more than once?"+id) |
|
|
transaction.commit() |
transaction.commit() |
|
|
Line 717 class ZSQLExtendFolder(Folder,Persistent
|
Line 717 class ZSQLExtendFolder(Folder,Persistent
|
#print "field",field |
#print "field",field |
if not field: |
if not field: |
return 1 |
return 1 |
if field=="": |
if field.strip()=="": |
return 1 |
return 1 |
return 0 |
return 0 |
|
|
Line 784 class ZSQLExtendFolder(Folder,Persistent
|
Line 784 class ZSQLExtendFolder(Folder,Persistent
|
ret+="""</select>""" |
ret+="""</select>""" |
return 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 |
"""generate select options form a search list |
es wird |
es wird |
<select name=fieldname mutiple> |
<select name=fieldname mutiple> |
Line 797 class ZSQLExtendFolder(Folder,Persistent
|
Line 802 class ZSQLExtendFolder(Folder,Persistent
|
@parameter fieldName: Name des Feldes, das als value in den option-tag geschrieben werden soll. |
@parameter fieldName: Name des Feldes, das als value in den option-tag geschrieben werden soll. |
@parameter valueName: (optional) Name des Feldes, dass als im option-tag ausgegeben wird, default wert ist valueName=fieldName |
@parameter valueName: (optional) Name des Feldes, dass als im option-tag ausgegeben wird, default wert ist valueName=fieldName |
@start: (optional) falls zusaetzliches option tag erzeugt werden soll, gibt start an was im option tag steht |
@start: (optional) falls zusaetzliches option tag erzeugt werden soll, gibt start an was im option tag steht |
@startValue: gibt den entsprechenden Wert an. |
@startValue (optional): gibt den entsprechenden Wert an. |
|
@selected (optional): Wert der ausgewaehlt sein soll. |
|
@linelen: (optional) maximale laenge eines Eintrages |
|
der im Klappmenue noch angezeigt wird, laengeres wird abgeschnitten. |
|
@addionalSaelect (optional): zusaetzlicher text fuer den select tag |
""" |
""" |
if not valueName: |
if not valueName: |
valueName=fieldName |
valueName=fieldName |
Line 815 class ZSQLExtendFolder(Folder,Persistent
|
Line 824 class ZSQLExtendFolder(Folder,Persistent
|
startValue=start |
startValue=start |
|
|
ret+="""<option value="%s" >%s</option>"""%(startValue,start) |
ret+="""<option value="%s" >%s</option>"""%(startValue,start) |
|
|
for result in results: |
for result in results: |
field=getattr(result,fieldName) |
field=getattr(result,fieldName) |
fieldValue=getattr(result,valueName) |
fieldValue=getattr(result,valueName) |
if fieldValue: |
|
|
|
if not linelen: |
if linelen and fieldValue and (len(fieldValue) > string.atoi(linelen)): |
|
displayValue = fieldValue[:string.atoi(linelen)] |
|
else: |
|
displayValue = fieldValue |
|
|
|
|
if field == selected: |
if field == selected: |
|
|
ret+="""<option value="%s" selected>%s</option>"""%(field,fieldValue) |
ret+="""<option value="%s" selected>%s</option>"""%(field,displayValue) |
else: |
else: |
ret+="""<option value="%s">%s</option>"""%(field,fieldValue) |
ret+="""<option value="%s">%s</option>"""%(field,displayValue) |
|
|
else: |
|
mist = """%s"""%(fieldValue) |
|
if len(mist) > string.atoi(linelen): |
|
mist = mist[:string.atoi(linelen)] |
|
ret+="""<option value="%s">%s</option>"""%(field,mist) |
|
ret+="""</select>""" |
ret+="""</select>""" |
return ret |
return ret |
|
|
Line 907 class ZSQLExtendFolder(Folder,Persistent
|
Line 914 class ZSQLExtendFolder(Folder,Persistent
|
#print "INLINE:",argv |
#print "INLINE:",argv |
for a in argTmp.keys(): |
for a in argTmp.keys(): |
aFiltered=re.sub(r"^-","_",a) # beginning of a command should always be "_" |
aFiltered=re.sub(r"^-","_",a) # beginning of a command should always be "_" |
qs.append(aFiltered+"="+urllib.quote(str(argTmp[a]))) |
|
|
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 [] |
#return [] |
Line 1143 class ZSQLExtendFolder(Folder,Persistent
|
Line 1159 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""" |
"""search in database""" |
|
|
def delEmpty(list): |
def delEmpty(list): |
Line 1195 class ZSQLExtendFolder(Folder,Persistent
|
Line 1211 class ZSQLExtendFolder(Folder,Persistent
|
|
|
qs=string.join(delEmpty(qs.split(",")),",") |
qs=string.join(delEmpty(qs.split(",")),",") |
|
|
if storename: |
|
"""store""" |
|
else: |
|
storename="foundCount" |
|
|
|
#store query for further usage |
#store query for further usage |
|
#TODO: erste der beiden ist ueberfluessig |
self.REQUEST.SESSION['query']=qs |
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) |
#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) |
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"] |
#print self.REQUEST.SESSION["foundCount"] |
|
|
|
|
|
|
return ret |
return ret |
|
|
def ZSQLFoundCountLen(self,var): |
def ZSQLFoundCountLen(self,var): |
return len(var) |
return len(var) |
|
|
def ZSQLFoundCount(self,qs="",select="*",storename=None): |
def ZSQLFoundCount(self,qs="",select="*",storename="foundCount"): |
|
|
## 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" |
|
|
|
return self.REQUEST.SESSION[storename]['count'] |
return self.REQUEST.SESSION[storename]['count'] |
|
|
def ZSQLRangeStart(self,storename=None): |
def ZSQLRangeStart(self,storename="foundCount"): |
|
|
if storename: |
|
"""store""" |
|
else: |
|
storename="foundCount" |
|
|
|
return int(self.REQUEST.SESSION[storename]['rangeStart'])+1 |
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'] |
return self.REQUEST.SESSION[storename]['rangeSize'] |
|
|
def ZSQLRangeEnd(self,storename=None): |
def ZSQLRangeEnd(self,storename="foundCount"): |
|
|
if storename: |
|
"""store""" |
|
else: |
|
storename="foundCount" |
|
|
|
return str(min(int(self.REQUEST.SESSION[storename]['rangeEnd']),int(self.REQUEST.SESSION[storename]['count']))) |
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""" |
"""suche neu""" |
return self.ZSQLNewSearch(linkText,storename,url=self.REQUEST['URL'],args=argv) |
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""" |
"""suche mit alten parametern bis auf die in argv getauschten""" |
str = self.ZSQLNewSearchURL(storename, url, args, **argv) |
str = self.ZSQLNewSearchURL(storename, url, args, **argv) |
return """<a href="%s"> %s</a>"""%(str,linkText) |
return """<a href="%s"> %s</a>"""%(str,linkText) |
|
|
|
|
def ZSQLNewSearchURL(self, storename=None,url=None,args=None,**argv): |
def ZSQLNewSearchURL(self, storename="foundCount",url=None,args=None,**argv): |
"""suche mit alten parametern bis auf die in argv getauschten""" |
"""suche mit alten parametern bis auf die in argv getauschten""" |
|
|
if storename: |
|
"""store""" |
|
else: |
|
storename="foundCount" |
|
qs=self.REQUEST.SESSION[storename]['qs'] |
|
|
|
if args: |
if args: |
argv=args |
argv=args |
|
|
|
#get the old queries |
|
qs=self.REQUEST.SESSION[storename]['qs'] |
querys=qs.split(",") |
querys=qs.split(",") |
argList=[] |
|
arg="" |
|
queryList=[x.split("=")[0] for x in querys] |
|
|
|
for argTmp in argv.keys(): |
#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] |
|
|
arg=argTmp[0:] |
|
if arg[0]=="_":arg="-"+argTmp[1:] # aender _ in - als standard |
|
|
|
if arg not in queryList: # noch nicht drin |
argList=[] |
querys.append("%s=%s"%(arg,argv[argTmp])) |
arg="" |
argList.append(arg) |
|
|
|
|
|
|
|
newquery=[] |
#gehe durch die zu aendernden Argumente |
for query in querys: |
for argTmp in argv.keys(): |
queryArg=query.split("=")[0] |
|
qarg=queryArg[0:] |
|
if qarg[0]=="-":qarg="_"+queryArg[1:] # aender _ in - als standard |
|
|
|
if queryArg in argList: |
arg=argTmp[0:]# sicherstellen, dass der string auh kopiert wird |
newquery.append("%s=%s"%(queryArg,argv[qarg])) |
if arg[0]=="_": arg="-"+arg[1:] # sicherstellen, dass an Anfang stets "_" |
else: |
|
newquery.append(query) |
queryList[arg]=argv[argTmp] |
|
|
if url: |
if url: |
str=url+"?"+"&".join(newquery) |
str=url+"?"+urllib.urlencode(queryList) |
else: |
else: |
str="ZSQLSearch?"+"&".join(newquery) |
str="ZSQLSearch?"+urllib.urlencode(queryList) |
|
|
return str |
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""" |
"""analysieren den QueryString""" |
|
|
|
|
Line 1344 class ZSQLExtendFolder(Folder,Persistent
|
Line 1318 class ZSQLExtendFolder(Folder,Persistent
|
searchFields={} |
searchFields={} |
searchFieldsOnly={} |
searchFieldsOnly={} |
queryTemplate=[] |
queryTemplate=[] |
|
outerjoin="" |
|
debug=None |
|
|
if not select: |
if not select: |
select="oid,*" |
select="oid,*" |
Line 1362 class ZSQLExtendFolder(Folder,Persistent
|
Line 1338 class ZSQLExtendFolder(Folder,Persistent
|
for q in splitted: |
for q in splitted: |
|
|
name=re.sub("r'+'"," ",q.split("=")[0].lower()) |
name=re.sub("r'+'"," ",q.split("=")[0].lower()) |
|
if name=="_debug": |
|
debug=True |
|
|
try: |
try: |
value=urllib.unquote(q.split("=",1)[1]) |
value=urllib.unquote(q.split("=",1)[1]) |
except: |
except: |
Line 1400 class ZSQLExtendFolder(Folder,Persistent
|
Line 1379 class ZSQLExtendFolder(Folder,Persistent
|
|
|
|
|
name=re.sub("r'+'"," ",q.split("=")[0].lower()) |
name=re.sub("r'+'"," ",q.split("=")[0].lower()) |
|
|
try: |
try: |
value=urllib.unquote(q.split("=",1)[1]) |
value=urllib.unquote(q.split("=",1)[1]) |
|
|
except: |
except: |
value="" |
value="" |
|
|
Line 1429 class ZSQLExtendFolder(Folder,Persistent
|
Line 1410 class ZSQLExtendFolder(Folder,Persistent
|
skip="OFFSET "+str(value) |
skip="OFFSET "+str(value) |
rangeStart=str(value) |
rangeStart=str(value) |
elif name==iCT+"join": |
elif name==iCT+"join": |
|
|
whereList.append(value) |
whereList.append(value) |
|
elif name==iCT+"outerjoin": |
|
|
|
outerjoin=value |
elif name==iCT+"sort": |
elif name==iCT+"sort": |
sortstrs=[] |
sortstrs=[] |
|
|
for word in value.split(','): |
for word in value.split(','): |
wordstr=word.lstrip().rstrip() |
wordstr=word.lstrip().rstrip() |
if sortAllFields: |
if sortAllFields: |
Line 1511 class ZSQLExtendFolder(Folder,Persistent
|
Line 1497 class ZSQLExtendFolder(Folder,Persistent
|
|
|
#print "OP",op,name |
#print "OP",op,name |
value=value.lower() |
value=value.lower() |
|
|
tmp="" |
tmp="" |
if opfields.has_key(name): |
if opfields.has_key(name): |
op=opfields[name] |
op=opfields[name] |
Line 1584 class ZSQLExtendFolder(Folder,Persistent
|
Line 1571 class ZSQLExtendFolder(Folder,Persistent
|
|
|
#print "QE",table |
#print "QE",table |
#print (select,table,where,sort,maxstr,skip) |
#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": |
if not nostore=="yes": |
|
|
self.REQUEST.SESSION['qs']=opfields |
self.REQUEST.SESSION['qs']=opfields |
#print "IAMHERE again:", query |
#print "IAMHERE again:", query |
|
|
if storename and (not NoQuery): |
if not NoQuery: |
|
|
query2="SELECT count(*) FROM %s %s"%(table,where) |
query2="SELECT count(*) FROM %s %s"%(table,where) |
|
|
Line 1616 class ZSQLExtendFolder(Folder,Persistent
|
Line 1603 class ZSQLExtendFolder(Folder,Persistent
|
|
|
self.REQUEST.SESSION[storename]['queryString2']=query2 |
self.REQUEST.SESSION[storename]['queryString2']=query2 |
if self.ZSQLSimpleSearch(query2): |
if self.ZSQLSimpleSearch(query2): |
|
|
self.REQUEST.SESSION[storename]['count']=self.ZSQLSimpleSearch(query2)[0].count |
self.REQUEST.SESSION[storename]['count']=self.ZSQLSimpleSearch(query2)[0].count |
else: |
else: |
self.REQUEST.SESSION[storename]['count']=0 |
self.REQUEST.SESSION[storename]['count']=0 |
Line 1623 class ZSQLExtendFolder(Folder,Persistent
|
Line 1611 class ZSQLExtendFolder(Folder,Persistent
|
|
|
|
|
self.REQUEST.SESSION[storename]['rangeStart']=rangeStart |
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'] |
self.REQUEST.SESSION[storename]['rangeEnd']=self.REQUEST.SESSION[storename]['count'] |
else: |
else: |
self.REQUEST.SESSION[storename]['rangeEnd']=int(rangeStart)+int(limit) |
self.REQUEST.SESSION[storename]['rangeEnd']=int(rangeStart)+int(limit) |
Line 1632 class ZSQLExtendFolder(Folder,Persistent
|
Line 1624 class ZSQLExtendFolder(Folder,Persistent
|
|
|
self.REQUEST.SESSION[storename]['searchFieldsOnly']=searchFieldsOnly |
self.REQUEST.SESSION[storename]['searchFieldsOnly']=searchFieldsOnly |
|
|
|
if debug: |
|
logging.error("ZSQLSimpleSearch %s"%query) |
if not NoQuery: |
if not NoQuery: |
|
|
return self.ZSQLQuery(query) |
return self.ZSQLQuery(query) |
Line 1716 class ZSQLExtendFolder(Folder,Persistent
|
Line 1710 class ZSQLExtendFolder(Folder,Persistent
|
limit=1 |
limit=1 |
newRangeStart=0 |
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 |
#newRangeStart=self.REQUEST.SESSION[storename]['count']-1 |
return "" |
return "" |
|
|
Line 1815 class ZSQLExtendFolder(Folder,Persistent
|
Line 1809 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 "<a href='%s'>%s</a>"%(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 "<a href='%s'>%s</a>"%(self.actualPath()+"?"+newquerystring,html) |
|
|
|
|
|
manage_addZSQLExtendFolderForm=DTMLFile('ZSQLExtendFolderAdd', globals()) |
manage_addZSQLExtendFolderForm=DTMLFile('ZSQLExtendFolderAdd', globals()) |
|
|