version 1.30, 2004/08/04 11:02:39
|
version 1.31, 2004/08/18 14:47:58
|
Line 352 class ZSQLExtendFolder(Folder,Persistent
|
Line 352 class ZSQLExtendFolder(Folder,Persistent
|
ret.append(x) |
ret.append(x) |
return ret |
return ret |
|
|
self.REQUEST.SESSION['come_from_search']="no" # zurücksetzen |
#self.REQUEST.SESSION['come_from_search']="no" # zurücksetzen |
if qs=="": |
if qs=="": |
if self.REQUEST['QUERY_STRING']: |
if self.REQUEST['QUERY_STRING']: |
qs=self.REQUEST['QUERY_STRING'] |
qs=self.REQUEST['QUERY_STRING'] |
Line 464 class ZSQLExtendFolder(Folder,Persistent
|
Line 464 class ZSQLExtendFolder(Folder,Persistent
|
rangeStart=0 |
rangeStart=0 |
limit=0 |
limit=0 |
searchFields={} |
searchFields={} |
|
searchFieldsOnly={} |
if not select: |
if not select: |
select="oid,*" |
select="oid,*" |
#print "Q",nostore,qs |
#print "Q",nostore,qs |
Line 560 class ZSQLExtendFolder(Folder,Persistent
|
Line 560 class ZSQLExtendFolder(Folder,Persistent
|
|
|
if searchFields.has_key(name): |
if searchFields.has_key(name): |
searchFields[name]+=lopfields.get(name,'OR')+" "+tmp |
searchFields[name]+=lopfields.get(name,'OR')+" "+tmp |
|
searchFieldsOnly[name]+=lopfields.get(name,'OR')+" "+value |
else: |
else: |
searchFields[name]=tmp |
searchFields[name]=tmp |
|
searchFieldsOnly[name]=value |
|
|
|
|
## for name in searchFields.keys(): |
## for name in searchFields.keys(): |
Line 631 class ZSQLExtendFolder(Folder,Persistent
|
Line 633 class ZSQLExtendFolder(Folder,Persistent
|
self.REQUEST.SESSION[storename]['rangeEnd']=int(rangeStart)+int(limit) |
self.REQUEST.SESSION[storename]['rangeEnd']=int(rangeStart)+int(limit) |
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 |
|
|
|
|
return self.ZSQLQuery(query) |
return self.ZSQLQuery(query) |
Line 670 class ZSQLExtendFolder(Folder,Persistent
|
Line 673 class ZSQLExtendFolder(Folder,Persistent
|
def getZSQLSearchFieldsList(self,storename="foundCount"): |
def getZSQLSearchFieldsList(self,storename="foundCount"): |
"""get searchfieldList""" |
"""get searchfieldList""" |
#print self.REQUEST.SESSION[storename]['searchFields'].keys() |
#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""" |
"""get searchfield""" |
#print "SF",self.REQUEST.SESSION[storename]['searchFields'] |
#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"): |
def nextLink(self,html,storename="foundCount"): |