--- ZSQLExtend/ZSQLExtend.py 2006/10/05 09:37:38 1.95
+++ ZSQLExtend/ZSQLExtend.py 2007/02/20 17:19:38 1.104
@@ -1,4 +1,3 @@
-
from OFS.Folder import Folder
from Acquisition import Implicit
from Globals import DTMLFile,package_home,Persistent
@@ -15,12 +14,20 @@ 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 logging
+
+#ersetzt logging
+def logger(txt,method,txt2):
+ """logging"""
+ logging.info(txt+ txt2)
+
+
from OFS.SimpleItem import SimpleItem
def getTextFromNode(nodename):
@@ -162,7 +169,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 +179,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 +207,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 +222,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 +232,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 +246,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 +255,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 +285,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 +299,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 +311,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)
@@ -345,7 +352,7 @@ class ZSQLExtendFolder(Folder,Persistent
field=dataSet[nr]
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
@@ -359,7 +366,7 @@ class ZSQLExtendFolder(Folder,Persistent
field=dataSet[nr]
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:
@@ -371,7 +378,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)
ret+="ad: %s \n"%field
elif node[1].nodeName=="METADATA":
@@ -383,21 +390,164 @@ class ZSQLExtendFolder(Folder,Persistent
for name in names:
fieldNames.append(name.getAttribute('NAME'))
- zLOG.LOG("update xml: fieldnames",zLOG.INFO,repr(fieldNames))
+ 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:
- zLOG.LOG("update xml: fieldname",zLOG.INFO,repr(fieldName))
+ 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'))
- zLOG.LOG("update xml: fieldname add",zLOG.INFO,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,data=None,filename=None,update_fields=None,id_field=None,sync_mode=False,RESPONSE=None):
+ '''
+ Import FileMaker XML file (FMPXMLRESULT format) into the table.
+ @param table: name of the table the xml shall be imported into
+ @param data: xml data as bz2 string
+ @param filename: xmlfile filename
+ @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)
+ '''
+ from xml.dom.pulldom import parseString,parse
+ import transaction
+
+ ret = ""
+
+ if data:
+ data=bz2.decompress(base64.decodestring(data))
+ logger("fmpxml",logging.INFO,"received file")
+ doc=parseString(data)
+ logger("fmpxml",logging.INFO,"parsed file")
+
+ elif filename:
+ fh=file(filename)
+ logger("fmpxml",logging.INFO,"reading file")
+ doc=parse(fh)
+ logger("fmpxml",logging.INFO,"parsed file")
+
+ dbIDs = {}
+ rowcnt = 0
+
+ if id_field is not None:
+ # prepare a list of ids for sync mode
+ qstr="select %s from %s"%(id_field,table)
+ for id in self.ZSQLSimpleSearch(qstr):
+ # value 0: not updated
+ dbIDs[id[0]] = 0;
+ rowcnt += 1
+ logger("fmpxml",logging.INFO,"%d entries in DB to sync"%rowcnt)
+
+ fieldNames = []
+ rowcnt = 0
+ id_val = ''
+
+ while 1:
+ node=doc.getEvent()
+
+ if node is None:
+ break;
+
+ # METADATA tag defines number and names of fields in FMPXMLRESULT
+ if node[1].nodeName == 'METADATA':
+ doc.expandNode(node[1])
+
+ names=node[1].getElementsByTagName('FIELD')
+
+ for name in names:
+ fn = name.getAttribute('NAME')
+ fieldNames.append(fn)
+
+ if update_fields is None:
+ # update all fields
+ update_fields = fieldNames
+
+ logger("fmpxml fieldnames:",logging.INFO,repr(fieldNames))
+ # get list of fields in db table
+ 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)]
+
+ # adjust db table to fields in XML and fieldlist
+ for fieldName in fieldNames:
+ logger("fmpxml fieldname:",logging.INFO,repr(fieldName))
+ if (fieldName not in columns) and (fieldName in update_fields):
+ qstr="""alter table %s add %s %s"""
+ self.ZSQLSimpleSearch(qstr%(table,fieldName,'text'))
+ logger("fmpxml add field:",logging.INFO,qstr%(table,fieldName,'text'))
+
+ # ROW tags (in RESULTSET tag) hold data
+ elif node[1].nodeName == 'ROW':
+ rowcnt += 1
+
+ doc.expandNode(node[1])
+ cols=node[1].getElementsByTagName('COL')
+ dataSet={}
+ i = 0
+ # populate with data
+ for col in cols:
+ data=col.getElementsByTagName('DATA')
+ dataSet[fieldNames[i]] = getTextFromNode(data[0])
+ i += 1
+
+ update=False
+
+ # synchronize by id_field
+ if id_field:
+ id_val=dataSet[id_field]
+ if id_val in dbIDs:
+ dbIDs[id_val] += 1
+ update=True
+
+ if update:
+ # update existing row (by id_field)
+ setvals=[]
+ for fieldName in update_fields:
+ setvals.append("%s = %s"%(fieldName,self.ZSQLQuote(dataSet[fieldName])))
+ setStr=string.join(setvals, ',')
+ id_val=dataSet[id_field]
+ qstr="""UPDATE %s SET %s WHERE %s = '%s' """%(table,setStr,id_field,id_val)
+ #logger("fmpxml update:",logging.INFO,queryStr)
+ self.ZSQLSimpleSearch(qstr)
+ ret+="up: %s \n"%id_val
+ else:
+ # create new row
+ fields=string.join(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)
+ self.ZSQLSimpleSearch(qstr)
+ #logger("fmpxml: insert",logging.INFO,queryStr)
+ ret+="ad: %s \n"%dataSet.get(id_field, rowcnt)
+
+ #logger("fmpxml row:",logging.INFO,"%d (%s)"%(rowcnt,id_val))
+ if (rowcnt % 10) == 0:
+ logger("fmpxml row:",logging.INFO,"%d (%s)"%(rowcnt,id_val))
+ transaction.commit()
+
+ transaction.commit()
+ if sync_mode:
+ # delete unmatched entries in db
+ for id in dbIDs.keys():
+ # find all not-updated fields
+ if dbIDs[id] == 0:
+ logger("fmpxml delete:",logging.INFO,id)
+ qstr = "DELETE FROM %s WHERE %s = '%s'"
+ self.ZSQLSimpleSearch(qstr%(table,id_field,id))
+
+ elif dbIDs[id] > 1:
+ logger("fmpxml sync:",logging.INFO,"id used more than once?"+id)
+
+ transaction.commit()
+
+ return ret
def generateIndex(self,field,index_name,table,RESPONSE=None):
"""erzeuge index aus feld"""
@@ -567,7 +717,7 @@ class ZSQLExtendFolder(Folder,Persistent
#print "field",field
if not field:
return 1
- if field=="":
+ if field.strip()=="":
return 1
return 0
@@ -648,6 +798,8 @@ class ZSQLExtendFolder(Folder,Persistent
@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
@startValue: gibt den entsprechenden Wert an.
+ @linelen: (optional) maximale laenge eines Eintrages
+ der im Klappmenue noch angezeigt wird, laengeres wird abgeschnitten.
"""
if not valueName:
valueName=fieldName
@@ -668,8 +820,9 @@ class ZSQLExtendFolder(Folder,Persistent
for result in results:
field=getattr(result,fieldName)
fieldValue=getattr(result,valueName)
- if fieldValue:
+ if fieldValue:
+
if not linelen:
@@ -705,7 +858,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)
@@ -734,9 +888,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"""
@@ -753,11 +909,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 []
@@ -776,11 +939,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"""
@@ -803,7 +966,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:
@@ -816,7 +979,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'):
@@ -904,7 +1067,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
@@ -916,19 +1079,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()))
@@ -946,12 +1113,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)
@@ -1112,13 +1282,19 @@ class ZSQLExtendFolder(Folder,Persistent
def ZSQLNewSearch(self,linkText,storename=None,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)
+
+ def ZSQLNewSearchURL(self, storename=None,url=None,args=None,**argv):
+ """suche mit alten parametern bis auf die in argv getauschten"""
+
if storename:
"""store"""
else:
storename="foundCount"
qs=self.REQUEST.SESSION[storename]['qs']
-
+
if args:
argv=args
@@ -1131,7 +1307,7 @@ class ZSQLExtendFolder(Folder,Persistent
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]))
@@ -1155,12 +1331,12 @@ class ZSQLExtendFolder(Folder,Persistent
else:
str="ZSQLSearch?"+"&".join(newquery)
- 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):
"""analysieren den QueryString"""
-
-
+
+
#setzte generische werte
lop="AND" # standardsuche mit and
@@ -1180,6 +1356,7 @@ class ZSQLExtendFolder(Folder,Persistent
searchFields={}
searchFieldsOnly={}
queryTemplate=[]
+ outerjoin=""
if not select:
select="oid,*"
@@ -1236,8 +1413,10 @@ class ZSQLExtendFolder(Folder,Persistent
name=re.sub("r'+'"," ",q.split("=")[0].lower())
+
try:
value=urllib.unquote(q.split("=",1)[1])
+
except:
value=""
@@ -1265,9 +1444,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:
@@ -1293,9 +1477,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):
@@ -1347,6 +1531,7 @@ class ZSQLExtendFolder(Folder,Persistent
#print "OP",op,name
value=value.lower()
+
tmp=""
if opfields.has_key(name):
op=opfields[name]
@@ -1420,7 +1605,7 @@ 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":
@@ -1467,9 +1652,9 @@ class ZSQLExtendFolder(Folder,Persistent
self.REQUEST.SESSION[storename]['searchFields']=searchFields
self.REQUEST.SESSION[storename]['searchFieldsOnly']=searchFieldsOnly
-
+
if not NoQuery:
-
+
return self.ZSQLQuery(query)
else:
@@ -1490,8 +1675,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)
@@ -1518,7 +1703,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):