version 1.38, 2004/09/27 20:48:54
|
version 1.39, 2004/10/05 17:48:50
|
Line 545 class ZSQLExtendFolder(Folder,Persistent
|
Line 545 class ZSQLExtendFolder(Folder,Persistent
|
lopfields[field]=lop |
lopfields[field]=lop |
|
|
if name[0:10]==iCT+"sortorder": |
if name[0:10]==iCT+"sortorder": |
sort=value |
#sort=value |
|
|
field=name[11:] |
field=name[11:] |
sortfields[field]=sort |
sortAllFields=None |
|
#no field selected |
|
if field=="": |
|
sortAllFields=value |
|
else: |
|
sortfields[field]=value |
|
|
#print "HI",op,field |
#print "HI",op,field |
#print opfieldsa |
#print opfieldsa |
Line 588 class ZSQLExtendFolder(Folder,Persistent
|
Line 593 class ZSQLExtendFolder(Folder,Persistent
|
sortstrs=[] |
sortstrs=[] |
for word in value.split(','): |
for word in value.split(','): |
wordstr=word.lstrip().rstrip() |
wordstr=word.lstrip().rstrip() |
|
if sortAllFields: |
|
order=sortAllFields |
|
else: |
order=sortfields.get(wordstr,'ASC') |
order=sortfields.get(wordstr,'ASC') |
|
|
|
if not (wordstr == ""): |
sortstrs.append(wordstr+" "+order) |
sortstrs.append(wordstr+" "+order) |
if len(sortstrs)>0: |
if len(sortstrs)>0: |
sort="ORDER BY "+string.join(sortstrs,',') |
sort="ORDER BY "+string.join(sortstrs,',') |
|
|
|
|
elif name==iCT+"token": |
elif name==iCT+"token": |
if not nostore=="yes": |
if not nostore=="yes": |
self.REQUEST.SESSION['token']=value |
self.REQUEST.SESSION['token']=value |
Line 642 class ZSQLExtendFolder(Folder,Persistent
|
Line 653 class ZSQLExtendFolder(Folder,Persistent
|
searchFields[name]=tmp |
searchFields[name]=tmp |
searchFieldsOnly[name]=value |
searchFieldsOnly[name]=value |
|
|
|
|
## for name in searchFields.keys(): |
|
## value=searchFields[name] |
|
|
|
## if opfields.has_key(name): |
|
## op=opfields[name] |
|
## else: |
|
## op="ct" |
|
## name="LOWER("+name+")" |
|
## if op=="ct": |
|
## whereList.append(name+" LIKE "+sql_quote("%"+value+"%")) |
|
## elif op=="gt": |
|
## whereList.append(name+">"+sql_quote(value)) |
|
## elif op=="lt": |
|
## whereList.append(name+"<"+sql_quote(value)) |
|
## elif op=="eq": |
|
## whereList.append(name+"="+sql_quote(value)) |
|
## elif op=="bw": |
|
## whereList.append(name+" LIKE "+sql_quote(value+"%")) |
|
## elif op=="ew": |
|
## whereList.append(name+" LIKE "+sql_quote("%"+value)) |
|
## op="ct" |
|
|
|
## #except: |
|
## # print "END",value,name,Exception |
|
|
|
whereList=["("+searchFields[x]+")" for x in searchFields.keys()] |
whereList=["("+searchFields[x]+")" for x in searchFields.keys()] |
|
|
if len(whereList)>0: |
if len(whereList)>0: |
Line 690 class ZSQLExtendFolder(Folder,Persistent
|
Line 675 class ZSQLExtendFolder(Folder,Persistent
|
where+="and "+restrictConnect[0]+" in ("+restrictConnect[1]+")" |
where+="and "+restrictConnect[0]+" in ("+restrictConnect[1]+")" |
|
|
#print "QE",table |
#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"%(select,table,where,sort,maxstr,skip) |
|
|
if not nostore=="yes": |
if not nostore=="yes": |
Line 728 class ZSQLExtendFolder(Folder,Persistent
|
Line 713 class ZSQLExtendFolder(Folder,Persistent
|
self.REQUEST.SESSION[storename]['rangeSize']=limit |
self.REQUEST.SESSION[storename]['rangeSize']=limit |
self.REQUEST.SESSION[storename]['searchFields']=searchFields |
self.REQUEST.SESSION[storename]['searchFields']=searchFields |
self.REQUEST.SESSION[storename]['searchFieldsOnly']=searchFieldsOnly |
self.REQUEST.SESSION[storename]['searchFieldsOnly']=searchFieldsOnly |
|
#print "QS", query |
if not NoQuery: |
if not NoQuery: |
|
|
return self.ZSQLQuery(query) |
return self.ZSQLQuery(query) |
Line 800 class ZSQLExtendFolder(Folder,Persistent
|
Line 785 class ZSQLExtendFolder(Folder,Persistent
|
if self.REQUEST['QUERY_STRING']=="": |
if self.REQUEST['QUERY_STRING']=="": |
qs=self.REQUEST.SESSION['query'] |
qs=self.REQUEST.SESSION['query'] |
|
|
queries=string.split(qs,",") |
queries=string.split(qs,",")[0:] |
|
|
|
|
else: |
else: |
qs=self.REQUEST['QUERY_STRING'] |
qs=self.REQUEST['QUERY_STRING'] |
queries=string.split(qs,"&") |
queries=string.split(qs,"&")[0:] |
|
|
|
|
|
|
Line 815 class ZSQLExtendFolder(Folder,Persistent
|
Line 800 class ZSQLExtendFolder(Folder,Persistent
|
|
|
for query in queries: |
for query in queries: |
|
|
#print query.split("=")[0] |
if query[0]=="_" : query="-"+query[1:] |
if query[0]=="_" : query[0]="-" |
|
|
|
if query.split("=")[0].lower()=="-skip": |
if query.split("=")[0].lower()=="-skip": |
|
|