--- ZSQLExtend/ZSQLExtend.py 2006/09/16 16:15:24 1.93
+++ ZSQLExtend/ZSQLExtend.py 2006/12/08 16:23:54 1.98
@@ -1,4 +1,3 @@
-
from OFS.Folder import Folder
from Acquisition import Implicit
from Globals import DTMLFile,package_home,Persistent
@@ -19,9 +18,21 @@ import zLOG
import os.path
import os
import copy
+import unicodedata
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:
+ if node.nodeType == node.TEXT_NODE:
+ rc = rc + node.data
+ return rc
+
def analyseIntSearch(word):
#analyse integer searches
@@ -321,6 +332,66 @@ class ZSQLExtendFolder(Folder,Persistent
else:
if node[1].nodeName==containerTagName:
doc.expandNode(node[1])
+ cols=node[1].getElementsByTagName('COL')
+ dataSet=[]
+ for col in cols:
+ data=col.getElementsByTagName('DATA')
+ dataSet.append(getTextFromNode(data[0]))
+ update=False
+ if identify:
+
+ nr=fieldNames.index(identify)
+ field=dataSet[nr]
+
+ searchStr="""select %s from %s where %s = '%s'"""%(identify,table,identify,field)
+ zLOG.LOG("import xml",zLOG.INFO,searchStr)
+ search=self.ZSQLSimpleSearch(searchStr)
+ if search:
+ update=True
+
+ if update:
+ tmp=[]
+ for fieldName in fieldNames:
+ tmp.append("""%s = %s"""%(fieldName,self.ZSQLQuote(dataSet[fieldNames.index(fieldName)])))
+ setStr=",".join(tmp)
+ nr=fieldNames.index(identify)
+ field=dataSet[nr]
+
+ queryStr="""UPDATE %s SET %s WHERE %s = '%s' """%(table,setStr,identify,field)
+ zLOG.LOG("update xml",zLOG.INFO,queryStr)
+ self.ZSQLSimpleSearch(queryStr)
+ ret+="ud: %s \n"%field
+ else:
+
+
+ fields=",".join(fieldNames)
+ values=",".join([""" %s """%self.ZSQLQuote(x) for x in dataSet])
+
+
+ queryStr="""INSERT INTO %s (%s) VALUES (%s)"""%(table,fields,values)
+ self.ZSQLSimpleSearch(queryStr)
+ zLOG.LOG("update xml",zLOG.INFO,queryStr)
+ ret+="ad: %s \n"%field
+
+ elif node[1].nodeName=="METADATA":
+ fieldNames=[]
+ doc.expandNode(node[1])
+
+ names=node[1].getElementsByTagName('FIELD')
+
+ for name in names:
+ fieldNames.append(name.getAttribute('NAME'))
+
+ zLOG.LOG("update xml: fieldnames",zLOG.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))
+ 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'))
#fn=node[1].getAttribute("xml:id")
#nf=file("xtf/"+fn+".xtf",'w')
#nf.write(""""""+node[1].toxml()+"")
@@ -633,7 +704,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)
@@ -681,11 +753,9 @@ 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 "_"
+ qs.append(aFiltered+"="+urllib.quote(str(argTmp[a])))
+
#return []
@@ -713,7 +783,7 @@ class ZSQLExtendFolder(Folder,Persistent
def ZSQLSimpleSearch(self,query=None,max_rows=1000000):
"""simple search"""
-
+ #print query
if not query:
query=self.query
@@ -874,7 +944,10 @@ 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,",")
@@ -1040,7 +1113,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:
@@ -1083,7 +1162,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"""
@@ -1100,6 +1179,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
@@ -1142,6 +1222,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
@@ -1167,6 +1251,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":
@@ -1207,6 +1296,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):
@@ -1215,7 +1311,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":
@@ -1378,9 +1474,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: