version 1.47, 2004/10/29 10:45:22
|
version 1.49, 2004/11/03 14:52:30
|
Line 1
|
Line 1
|
from OFS.Folder import Folder |
from OFS.Folder import Folder |
from Globals import Persistent |
from Globals import Persistent |
from Acquisition import Implicit |
from Acquisition import Implicit |
from Globals import DTMLFile |
from Globals import DTMLFile,package_home |
import urllib |
import urllib |
import re |
import re |
import string |
import string |
Line 505 class ZSQLExtendFolder(Folder,Persistent
|
Line 505 class ZSQLExtendFolder(Folder,Persistent
|
|
|
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 ZSQLNewSearch(self,linkText,storename=None,**argv): |
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""" |
"""suche mit alten parametern bis auf die in argv getauschten""" |
|
|
if storename: |
if storename: |
Line 514 class ZSQLExtendFolder(Folder,Persistent
|
Line 518 class ZSQLExtendFolder(Folder,Persistent
|
storename="foundCount" |
storename="foundCount" |
qs=self.REQUEST.SESSION[storename]['qs'] |
qs=self.REQUEST.SESSION[storename]['qs'] |
|
|
|
if args: |
|
argv=args |
|
|
querys=qs.split(",") |
querys=qs.split(",") |
argList=[] |
argList=[] |
arg="" |
arg="" |
Line 542 class ZSQLExtendFolder(Folder,Persistent
|
Line 549 class ZSQLExtendFolder(Folder,Persistent
|
else: |
else: |
newquery.append(query) |
newquery.append(query) |
|
|
|
if url: |
|
str=url+"?"+"&".join(newquery) |
|
else: |
str="ZSQLSearch?"+"&".join(newquery) |
str="ZSQLSearch?"+"&".join(newquery) |
|
|
return """<a href="%s"> %s</a>"""%(str,linkText) |
return """<a href="%s"> %s</a>"""%(str,linkText) |
Line 712 class ZSQLExtendFolder(Folder,Persistent
|
Line 721 class ZSQLExtendFolder(Folder,Persistent
|
|
|
tmp=string.join(tmps,' OR ') |
tmp=string.join(tmps,' OR ') |
|
|
op="ct" |
op="all" |
|
|
if (not tableExt) or (namealt.split('.')[0]==tableExt): |
if (not tableExt) or (namealt.split('.')[0]==tableExt): |
if searchFields.has_key(name): |
if searchFields.has_key(name): |