--- ZSQLExtend/ZSQLExtend.py 2005/12/22 21:10:34 1.77
+++ ZSQLExtend/ZSQLExtend.py 2006/04/20 14:08:35 1.80
@@ -19,6 +19,15 @@ import os.path
import os
from OFS.SimpleItem import SimpleItem
+def getTextFromNode(nodename):
+ 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
@@ -71,34 +80,111 @@ class ZSQLExtendFolder(Folder,Persistent
"""quote str for sql"""
return sql_quote(str)
+
- def importXMLFile(self,table,containerTagName,file,identify=None,RESPONSE=None):
+ def importXMLFile(self,table,data=None,identify=None,filename=None,RESPONSE=None):
#TODO: finish importXMLFile
'''
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 file: xmlfile handle
+ @param data: data to be imported
@param identify: (optional) field res. tag which identifies a entry uniquely for updating purposes.
@param RESPONSE: (optional)
'''
- from xml.dom.pulldom import parseString
-
- doc=parseString(file.read())
+ 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")
+
+ elif filename:
+ fh=file(filename)
+ doc=parse(fh)
+ zLOG.LOG("import xml",zLOG.INFO,"parsed file")
while 1:
node=doc.getEvent()
-
+
if node is None:
break;
else:
- if node[1].nodeName==containerTagName:
+ if node[1].nodeName=='ROW':
+ 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()+"")
#print "wrote: %s"%fn
-
-
+ return ret
+
def generateIndex(self,field,index_name,table,RESPONSE=None):
"""erzeuge index aus feld"""
index={}
@@ -171,14 +257,22 @@ class ZSQLExtendFolder(Folder,Persistent
return ""
def getLabel(self):
- """getLabe"""
+ """getLabel"""
try:
return self.label
except:
return ""
+
+ def getTitle(self):
+ """getTitle"""
+ try:
+ return self.title
+ except:
+ return ""
+
def getDescription(self):
- """getLabe"""
+ """getDescription"""
try:
return self.description
except:
@@ -207,6 +301,10 @@ 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:
@@ -443,13 +541,15 @@ class ZSQLExtendFolder(Folder,Persistent
except:
zLOG.LOG("ZSQLResetConnection",zLOG.ERROR, '%s %s'%sys.exc_info()[:2])
- def ZSQLSimpleSearch(self,query=None,max_rows=1000000):
+ def ZSQLSimpleSearch(self,query=None,max_rows=1000000,debug=None):
"""simple search"""
+
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","")
@@ -660,7 +760,7 @@ class ZSQLExtendFolder(Folder,Persistent
if field[0]=="_":
fieldTmp="-"+field[1:]
else:
- fieldTmp=field
+ fieldTmp=urllib.unqoute(field)
qs+=",%s=%s"%(fieldTmp,argv[field])
@@ -1102,6 +1202,7 @@ class ZSQLExtendFolder(Folder,Persistent
self.REQUEST.SESSION[storename]['searchFields']=searchFields
self.REQUEST.SESSION[storename]['searchFieldsOnly']=searchFieldsOnly
+
if not NoQuery:
return self.ZSQLQuery(query)