--- ZSQLExtend/ZSQLExtend.py 2005/12/22 20:33:11 1.76
+++ ZSQLExtend/ZSQLExtend.py 2006/03/28 19:54:41 1.79
@@ -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,99 @@ 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,identify=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
+
+
+ #fh=file("/tmp/fmpxml.xml")
+ import bz2
+ import base64
+
+ ret=""
+ data=bz2.decompress(base64.decodestring(data))
+ #data=fh.read()
- doc=parseString(file.read())
+ doc=parseString(data)
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)
+ 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)
+ 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)
+ 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'))
+
+ 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:
+ if fieldName not in columns:
+ qstr="""alter table %s add %s %s"""
+ self.ZSQLSimpleSearch(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 +245,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 +289,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:
@@ -241,22 +327,22 @@ class ZSQLExtendFolder(Folder,Persistent
return ""
def actualPath(self,url=None):
- """path"""
+ """path"""
if self.REQUEST['HTTP_X_FORWARDED_SERVER']=='':
host=self.REQUEST['HTTP_HOST']
else:
host=self.REQUEST['HTTP_X_FORWARDED_SERVER']
- if not url:
- return "http://"+host+self.REQUEST['PATH_TRANSLATED']
- else:
- temp=self.REQUEST[url].split("/")
- temp[2]=host
- return string.join(temp,"/")
+ if not url:
+ return "http://"+host+self.REQUEST['PATH_TRANSLATED']
+ else:
+ temp=self.REQUEST[url].split("/")
+ temp[2]=host
+ return string.join(temp,"/")
def getRequest(self):
- """request"""
- return self.REQUEST
+ """request"""
+ return self.REQUEST
def lowerEnd(self,path):
"""oinly for demo"""
@@ -273,12 +359,12 @@ class ZSQLExtendFolder(Folder,Persistent
def ZSQLsearchOptions(self,fieldname=""):
"""return HTML Fragment with search options"""
-
+
ret=""""""%fieldname
return ret
@@ -320,8 +406,8 @@ class ZSQLExtendFolder(Folder,Persistent
ret="""