--- ZSQLExtend/ZSQLExtend.py 2006/05/16 15:56:03 1.85
+++ ZSQLExtend/ZSQLExtend.py 2007/02/01 14:48:59 1.101
@@ -14,12 +14,26 @@ 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):
+ """get the cdata content of a node"""
+ if nodename is None:
+ return ""
nodelist=nodename.childNodes
rc = ""
for node in nodelist:
@@ -27,7 +41,6 @@ def getTextFromNode(nodename):
rc = rc + node.data
return rc
-
def analyseIntSearch(word):
#analyse integer searches
@@ -125,7 +138,7 @@ class ZSQLExtendFolder(Folder,Persistent
containers=db.xpath("./@container")
identifiers=db.xpath("./@identify")
- print containers
+
if not (len(containers)==1):
return False
else:
@@ -147,6 +160,7 @@ class ZSQLExtendFolder(Folder,Persistent
@param elementNameForTable: must be a element of type complex type. the element of the sequence in the complex type
define the columns of the table >table<
@param data (optional): data to be imported
+
@param filename (optional) or filename
@param identify: (optional) field res. tag which identifies a entry uniquely for updating purposes.
@param RESPONSE: (optional)
@@ -155,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
@@ -165,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'}
@@ -193,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)]
@@ -208,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.LOG("update xml: fieldname",logging.INFO,repr(fieldName))
if fieldName.lower() not in columns:
if create:# table does not exist therefore create with one column
@@ -218,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'))
+ logging.LOG("update xsd: fieldname add",logging.INFO,qstr%(table,fieldName,'text'))
def importXMLFileAccess(self,table,container,data=None,identify=None,filename=None,RESPONSE=None):
@@ -232,7 +246,7 @@ class ZSQLExtendFolder(Folder,Persistent
'''
from xml.dom.pulldom import parseString,parse
- zLOG.LOG("import xml",zLOG.INFO,"called")
+ logging.LOG("import xml",logging.INFO,"called")
#fh=file("/tmp/fmpxml.xml")
import bz2
import base64
@@ -241,14 +255,14 @@ class ZSQLExtendFolder(Folder,Persistent
if data:
data=bz2.decompress(base64.decodestring(data))
- zLOG.LOG("import xml",zLOG.INFO,"received file")
+ logging.LOG("import xml",logging.INFO,"received file")
doc=parseString(data)
- zLOG.LOG("import xml",zLOG.INFO,"parsed file")
+ logging.LOG("import xml",logging.INFO,"parsed file")
elif filename:
fh=file(filename)
doc=parse(fh)
- zLOG.LOG("import xml",zLOG.INFO,"parsed file")
+ logging.LOG("import xml",logging.INFO,"parsed file")
while 1:
node=doc.getEvent()
@@ -263,7 +277,7 @@ class ZSQLExtendFolder(Folder,Persistent
if col.nodeType is col.ELEMENT_NODE:
data=col.nodeName
dataSet[data]=getTextFromNode(col)
- print dataSet.keys()
+
update=False
if identify:
@@ -271,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)
+ logging.LOG("import xml",logging.INFO,searchStr)
search=self.ZSQLSimpleSearch(searchStr)
if search:
update=True
@@ -285,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)
+ logging.LOG("update xml",logging.INFO,queryStr)
self.ZSQLSimpleSearch(queryStr)
ret+="ud: %s \n"%field
else:
@@ -297,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)
+ logging.LOG("update xml",logging.INFO,queryStr)
@@ -311,36 +325,20 @@ class ZSQLExtendFolder(Folder,Persistent
Import XML file into the table
@param table: name of the table the xml shall be imported into
@param containerTagName: XML-Tag which describes a dataset
- @param data: data to be imported
+ @param file: xmlfile handle
@param identify: (optional) field res. tag which identifies a entry uniquely for updating purposes.
@param RESPONSE: (optional)
'''
- from xml.dom.pulldom import parseString,parse
-
- zLOG.LOG("import xml",zLOG.INFO,"called")
- #fh=file("/tmp/fmpxml.xml")
- import bz2
- import base64
-
- ret=""
- if data:
- data=bz2.decompress(base64.decodestring(data))
-
- zLOG.LOG("import xml",zLOG.INFO,"received file")
- doc=parseString(data)
- zLOG.LOG("import xml",zLOG.INFO,"parsed file")
+ from xml.dom.pulldom import parseString
- elif filename:
- fh=file(filename)
- doc=parse(fh)
- zLOG.LOG("import xml",zLOG.INFO,"parsed file")
+ doc=parseString(file.read())
while 1:
node=doc.getEvent()
-
+
if node is None:
break;
else:
- if node[1].nodeName=='ROW':
+ if node[1].nodeName==containerTagName:
doc.expandNode(node[1])
cols=node[1].getElementsByTagName('COL')
dataSet=[]
@@ -354,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)
+ logging.LOG("import xml",logging.INFO,searchStr)
search=self.ZSQLSimpleSearch(searchStr)
if search:
update=True
@@ -368,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)
+ logging.LOG("update xml",logging.INFO,queryStr)
self.ZSQLSimpleSearch(queryStr)
ret+="ud: %s \n"%field
else:
@@ -380,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)
+ logging.LOG("update xml",logging.INFO,queryStr)
ret+="ad: %s \n"%field
elif node[1].nodeName=="METADATA":
@@ -392,22 +390,165 @@ class ZSQLExtendFolder(Folder,Persistent
for name in names:
fieldNames.append(name.getAttribute('NAME'))
- zLOG.LOG("update xml: fieldnames",zLOG.INFO,repr(fieldNames))
+ logging.LOG("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))
+ logging.LOG("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'))
+ logging.LOG("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
- return ret
-
+
+
+ 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))
+ zLOG.LOG("fmpxml",zLOG.INFO,"received file")
+ doc=parseString(data)
+ zLOG.LOG("fmpxml",zLOG.INFO,"parsed file")
+
+ elif filename:
+ fh=file(filename)
+ zLOG.LOG("fmpxml",zLOG.INFO,"reading file")
+ doc=parse(fh)
+ zLOG.LOG("fmpxml",zLOG.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
+
+ zLOG.LOG("fmpxml",zLOG.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
+
+ zLOG.LOG("fmpxml fieldnames:",zLOG.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:
+ zLOG.LOG("fmpxml fieldname:",zLOG.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'))
+ zLOG.LOG("fmpxml add field:",zLOG.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)
+ #zLOG.LOG("fmpxml update:",zLOG.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)
+ #zLOG.LOG("fmpxml: insert",zLOG.INFO,queryStr)
+ ret+="ad: %s \n"%dataSet.get(id_field, rowcnt)
+
+ #zLOG.LOG("fmpxml row:",zLOG.INFO,"%d (%s)"%(rowcnt,id_val))
+ if (rowcnt % 10) == 0:
+ zLOG.LOG("fmpxml row:",zLOG.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:
+ zLOG.LOG("fmpxml delete:",zLOG.INFO,id)
+ qstr = "DELETE FROM %s WHERE %s = '%s'"
+ self.ZSQLSimpleSearch(qstr%(table,id_field,id))
+
+ elif dbIDs[id] > 1:
+ zLOG.LOG("fmpxml sync:",zLOG.INFO,"id used more than once?"+id)
+
+ transaction.commit()
+
+ return ret
+
def generateIndex(self,field,index_name,table,RESPONSE=None):
"""erzeuge index aus feld"""
index={}
@@ -480,22 +621,14 @@ class ZSQLExtendFolder(Folder,Persistent
return ""
def getLabel(self):
- """getLabel"""
+ """getLabe"""
try:
return self.label
except:
return ""
-
- def getTitle(self):
- """getTitle"""
- try:
- return self.title
- except:
- return ""
-
def getDescription(self):
- """getDescription"""
+ """getLabe"""
try:
return self.description
except:
@@ -524,10 +657,6 @@ class ZSQLExtendFolder(Folder,Persistent
def formatAscii(self,str,url=None):
"""ersetze ascii umbrueche durch
"""
#url=None
-
- if not str:
- return ""
-
str=str.rstrip().lstrip()
if url and str:
@@ -690,14 +819,16 @@ class ZSQLExtendFolder(Folder,Persistent
field=getattr(result,fieldName)
fieldValue=getattr(result,valueName)
if fieldValue:
- print "XXX",field,repr(type(field)),repr(type(selected))
+
if not linelen:
+
if field == selected:
- print "huhu"
+
ret+=""""""%(field,fieldValue)
else:
ret+=""""""%(field,fieldValue)
+
else:
mist = """%s"""%(fieldValue)
if len(mist) > string.atoi(linelen):
@@ -707,7 +838,7 @@ class ZSQLExtendFolder(Folder,Persistent
return ret
- def ZSQLInlineSearchU(self,storename=None,**argv):
+ def ZSQLInlineSearchU(self,storename=None,args=None,**argv):
"""one element if exists"""
qs=[]
if storename:
@@ -716,11 +847,16 @@ class ZSQLExtendFolder(Folder,Persistent
else:
storename="foundCount"
-
+ if args:
+ argTmp=args
+ else:
+ argTmp=argv
+
#print "INLINE:",argv
- for a in argv.keys():
- qs.append(a+"="+urllib.quote(str(argv[a])))
+ for a in argTmp.keys():
+ 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)
@@ -728,7 +864,29 @@ class ZSQLExtendFolder(Folder,Persistent
return ret[0]
except:
return None
+
+
+ def ZSQLSequentialSearch(self,_fieldlist,_searchTerm,storename=None,args=None,**argv):
+ """get a list of tuples (fields,searchoptions,table) to search the searchTerm in, returns dictionary. """
+ #print "do search with:",_fieldlist,_searchTerm,storename,args,argv
+ ret={}
+ if args:
+ argTmp=args
+ else:
+ argTmp=argv
+
+ for field in _fieldlist:
+
+ argTmp2=copy.deepcopy(argTmp)
+ argTmp2[field[0]]=_searchTerm
+ argTmp2['_op_'+field[0]]=field[1]
+ argTmp2['_table']=field[2]
+
+ 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"""
@@ -739,20 +897,21 @@ class ZSQLExtendFolder(Folder,Persistent
storename="foundCount"
+
if args:
argTmp=args
else:
argTmp=argv
-
+
+
#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 "_"
+ qs.append(aFiltered+"="+urllib.quote(str(argTmp[a])))
+
#return []
+
return self.parseQueryString(string.join(qs,","),"_",storename=storename)
def ZSQLInlineSearch2(self,query):
@@ -768,21 +927,20 @@ class ZSQLExtendFolder(Folder,Persistent
try:
self.getConnectionObj().manage_close_connection()
except:
- zLOG.LOG("ZSQLResetConnection",zLOG.ERROR, '%s %s'%sys.exc_info()[:2])
+ logging.LOG("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])
+ logging.LOG("ZSQLResetConnection",logging.ERROR, '%s %s'%sys.exc_info()[:2])
- def ZSQLSimpleSearch(self,query=None,max_rows=1000000,debug=None):
+ def ZSQLSimpleSearch(self,query=None,max_rows=1000000):
"""simple search"""
- print query
-
+
+ #print query
if not query:
query=self.query
- if debug:
- print "DEBUG: ZSQLSimpleSearch:", query
+
if (hasattr(self,"_v_searchSQL") and (self._v_searchSQL == None)) or (not hasattr(self,"_v_searchSQL")):
self._v_searchSQL=Shared.DC.ZRDB.DA.DA("_v_searchSQL","_v_searchSQL",self.getConnectionObj().getId(),"var","")
@@ -796,7 +954,7 @@ class ZSQLExtendFolder(Folder,Persistent
try:
self.getConnectionObj().manage_open_connection()
except:
- zLOG.LOG("ZSQLSimpleSearch",zLOG.ERROR, '%s %s'%sys.exc_info()[:2])
+ logging.LOG("ZSQLSimpleSearch",logging.ERROR, '%s %s'%sys.exc_info()[:2])
else:
try:
@@ -809,7 +967,7 @@ class ZSQLExtendFolder(Folder,Persistent
try:
self.getConnectionObj().manage_open_connection()
except:
- zLOG.LOG("ZSQLSimpleSearch",zLOG.ERROR, '%s %s'%sys.exc_info()[:2])
+ logging.LOG("ZSQLSimpleSearch",logging.ERROR, '%s %s'%sys.exc_info()[:2])
def getConnectionObj(self):
if hasattr(self,'connection_id'):
@@ -845,6 +1003,11 @@ class ZSQLExtendFolder(Folder,Persistent
def ZSQLAdd(self,format=None,RESPONSE=None,args=None,**argv):
"""Neuer Eintrag"""
+ if args:
+ argTmp=args
+ else:
+ argTmp=argv
+
qs_temp=[]
for a in self.REQUEST.form.keys():
@@ -852,11 +1015,6 @@ class ZSQLExtendFolder(Folder,Persistent
qs=string.join(qs_temp,",")
- if args:
- argTmp=args
- else:
- argTmp=argv
-
for field in argTmp.keys():
if field[0]=="_":
fieldTmp="-"+field[1:]
@@ -897,41 +1055,38 @@ class ZSQLExtendFolder(Folder,Persistent
else:
return True
- def ZSQLChange(self,format=None,RESPONSE=None,USE_FORM=None,args=None,**argv):
+ def ZSQLChange(self,format=None,RESPONSE=None,USE_FORM=None,**argv):
"""change entries"""
#qs=self.REQUEST['QUERY_STRING']
# very bad hack
- print args
+
qs_temp=[]
if USE_FORM or RESPONSE:
for a in self.REQUEST.form.keys():
+
qs_temp.append(a+"="+urllib.quote(str(self.REQUEST.form[a])))
- if args:
- argTmp=args
- else:
- argTmp=argv
-
- for field in argTmp.keys():
+
+ for field in argv.keys():
if field[0]=="_":
fieldTmp="-"+field[1:]
else:
fieldTmp=field
- qs_temp.append("%s=%s"%(fieldTmp,argTmp[field]))
+ qs_temp.append("%s=%s"%(fieldTmp,argv[field]))
changeList=[]
for q in qs_temp:
-
+
name=urllib.unquote(re.sub("r'+'"," ",q.split("=")[0].lower()))
value="=".join(q.split("=")[1:])
value=re.sub(r'\+'," ",value)
value=urllib.unquote(value)
-
+
if name=="-table":
table=urllib.unquote(value)
elif name=="-identify":
@@ -939,13 +1094,18 @@ class ZSQLExtendFolder(Folder,Persistent
identify=identify.split("=")[0]+"="+sql_quote(identify.split("=")[1])
elif name=="-format":
format=urllib.unquote(value)
- elif (not (name[0]=="-" or name[0]=="_")) and (not len(value)==0):
+ #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)
+ logging.LOG("ZSQLExtend",logging.INFO,"CHANGE: "+queryString)
self.ZSQLSimpleSearch(queryString)
@@ -971,7 +1131,7 @@ class ZSQLExtendFolder(Folder,Persistent
def ZSQLFind2(self,qs="",select="oid,*",storename=None,tableList=['cdli_translit','cdli_cat'],restrictField='id_text',**argv):
"""find2"""
-
+
search1= self.ZSQLFind(qs=qs,select=select,storename=storename,tableExt=tableList[1],restrictField=restrictField,NoQuery='yes',NoLimit='yes',**argv)
search2 = self.ZSQLFind(tableExt=tableList[0],qs=qs,select=select,storename=storename,restrictConnect=(tableList[0]+"."+restrictField,search1),**argv)
@@ -1002,7 +1162,7 @@ class ZSQLExtendFolder(Folder,Persistent
if field[0]=="_":
fieldTmp="-"+field[1:]
else:
- fieldTmp=urllib.unquote(field)
+ fieldTmp=field
qs+=",%s=%s"%(fieldTmp,argv[field])
@@ -1031,21 +1191,19 @@ class ZSQLExtendFolder(Folder,Persistent
qs=string.join(delEmpty(qs.split(",")),",")
- if not storename:
+ if storename:
+ """store"""
+ else:
storename="foundCount"
#store query for further usage
self.REQUEST.SESSION['query']=qs
- print "st",storename,qs
+
#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)
#print self.REQUEST.SESSION["foundCount"]
-# if not hasattr(self,'_v_results'):
-# self._v_results={}
-#
-#
-# self._v_results[urllib.quote(qs)]=ret[0:]
+
return ret
@@ -1100,7 +1258,7 @@ class ZSQLExtendFolder(Folder,Persistent
else:
storename="foundCount"
- return str(min(int(self.REQUEST.SESSION[storename]['rangeEnd'])+1,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):
"""suche neu"""
@@ -1108,7 +1266,13 @@ 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:
@@ -1151,7 +1315,7 @@ 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"""
@@ -1168,6 +1332,7 @@ class ZSQLExtendFolder(Folder,Persistent
opfields={}
lopfields={} #Verknuepfung bei mehrfachauswahl von einem feld
sortfields={} #order of sortfields
+ diacritics={} #diacritische zeichen, falls "no", dann werden diese fuer das feld gefiltert.
sortAllFields=None
skip=""
rangeStart=0
@@ -1210,6 +1375,10 @@ class ZSQLExtendFolder(Folder,Persistent
field=name[5:]
lopfields[field]=lop
+ if name[0:11]==iCT+"diacritics":
+ field=name[12:]
+ diacritics[field]=value
+
if name[0:10]==iCT+"sortorder":
#sort=value
@@ -1235,6 +1404,11 @@ class ZSQLExtendFolder(Folder,Persistent
punktsplit=name.split(".") #sonderfall feld mit punkten(tabelle.suchFeld.ausgewaehltesFeld,feldinoriginal), d.h. suche in anderer tabelle:
#analysiere alle anderen faelle
+
+ if diacritics.get(name,'yes')=='no':
+ """filter diacritische zeichen"""
+ value=unicodedata.normalize('NFKD', value.decode('utf-8')).encode('ASCII', 'ignore')
+
if name==iCT+"lop":
lop=value
elif name==iCT+"table":
@@ -1275,6 +1449,13 @@ class ZSQLExtendFolder(Folder,Persistent
op=value
+ #sonderfall Name hat das Format:
+ #TABELLE.SUCHFELD_IN_DIESER_TABELLE.SELECT_FIELD.IDENTIFIER_IN_TABELLE_-table
+ #i.e. erzeugt wird
+ #das Statement
+ #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):
@@ -1283,7 +1464,7 @@ class ZSQLExtendFolder(Folder,Persistent
op="ct"
namealt=name
name="LOWER("+punktsplit[1]+")"
-
+ value=value.lower()
if op=="ct":
tmp=(name+" LIKE "+sql_quote("%"+value+"%"))
elif op=="gt":
@@ -1300,7 +1481,7 @@ class ZSQLExtendFolder(Folder,Persistent
tmps=[]
for word in value.split(" "):
tmps.append(name+" LIKE "+sql_quote("%"+word+"%"))
-
+
tmp=string.join(tmps,' AND ')
elif op=="numerical":
@@ -1314,14 +1495,12 @@ class ZSQLExtendFolder(Folder,Persistent
tmps.append(name+" LIKE "+sql_quote("%"+word+"%"))
tmp=string.join(tmps,' OR ')
-
- searchFieldsOnly[namealt]=value
+
op="all"
searchTmp="""%s in (select %s from %s where %s)"""%(punktsplit[3],punktsplit[2],punktsplit[0],tmp)
-
-
+
queryTemplate.append(searchTmp)
elif (not name[0]==iCT) and (not len(value)==0):
@@ -1379,7 +1558,7 @@ class ZSQLExtendFolder(Folder,Persistent
whereList=["("+searchFields[x]+")" for x in searchFields.keys()]
whereList+=queryTemplate
-
+
if len(whereList)>0:
if filter:
whereStr="("+string.join(whereList," "+lop+" ")+") AND "+filter
@@ -1446,12 +1625,11 @@ class ZSQLExtendFolder(Folder,Persistent
self.REQUEST.SESSION[storename]['rangeEnd']=int(rangeStart)+int(limit)
self.REQUEST.SESSION[storename]['rangeSize']=limit
self.REQUEST.SESSION[storename]['searchFields']=searchFields
- print "SF",searchFieldsOnly,searchFields
- self.REQUEST.SESSION[storename]['searchFieldsOnly']=searchFieldsOnly
-
+ self.REQUEST.SESSION[storename]['searchFieldsOnly']=searchFieldsOnly
+
if not NoQuery:
-
+
return self.ZSQLQuery(query)
else:
@@ -1472,7 +1650,7 @@ class ZSQLExtendFolder(Folder,Persistent
def ZSQLQuery(self,query,debug=None):
"""query"""
if debug:
- zLOG.LOG("ZSQLQuery", zLOG.INFO, query)
+ logging.LOG("ZSQLQuery", logging.INFO, query)
return self.ZSQLSimpleSearch(query)
@@ -1500,7 +1678,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):
@@ -2002,4 +2180,4 @@ def manage_addZSQLBibliography(self, id,
-
+
\ No newline at end of file