--- ZSQLExtend/ZSQLExtend.py 2006/04/20 17:40:11 1.81
+++ ZSQLExtend/ZSQLExtend.py 2006/09/16 15:17:24 1.92
@@ -1,3 +1,4 @@
+
from OFS.Folder import Folder
from Acquisition import Implicit
from Globals import DTMLFile,package_home,Persistent
@@ -17,17 +18,10 @@ import Shared.DC.ZRDB.DA
import zLOG
import os.path
import os
-from OFS.SimpleItem import SimpleItem
+import copy
-def getTextFromNode(nodename):
- nodelist=nodename.childNodes
- rc = ""
- for node in nodelist:
- if node.nodeType == node.TEXT_NODE:
- rc = rc + node.data
- return rc
+from OFS.SimpleItem import SimpleItem
-
def analyseIntSearch(word):
#analyse integer searches
@@ -80,6 +74,29 @@ class ZSQLExtendFolder(Folder,Persistent
"""quote str for sql"""
return sql_quote(str)
+
+ def normalizeField(self,table,fieldname, newFieldName=None,mode="alter", RESPONSE=None):
+ """normalize a field"""
+ import unicodedata
+
+ if not newFieldName:
+ newFieldName=fieldname+"_normal"
+
+ def normal(str):
+ if str:
+ return unicodedata.normalize('NFKD', str.decode('utf-8')).encode('ASCII', 'ignore')
+ else:
+ return ""
+ if mode=="create": # create the field
+ qstr="""alter table %s add %s %s"""
+ self.ZSQLSimpleSearch(qstr%(table,newFieldName,'text'))
+
+ qstr="select oid,%s from %s"%(fieldname,table)
+ for result in self.ZSQLSimpleSearch(qstr):
+ qstr="update %s set %s = %s where oid = %s"
+
+ self.ZSQLSimpleSearch(qstr%(table,newFieldName,self.ZSQLQuote(normal(getattr(result,fieldname))),result.oid))
+
def importAccessModell(self,configFileName,RESPONSE=None):
"""import tables from access
@param configFileName: xml-configfile
@@ -102,7 +119,7 @@ class ZSQLExtendFolder(Folder,Persistent
containers=db.xpath("./@container")
identifiers=db.xpath("./@identify")
- print containers
+
if not (len(containers)==1):
return False
else:
@@ -124,6 +141,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)
@@ -164,7 +182,7 @@ class ZSQLExtendFolder(Folder,Persistent
#check if table exists
qstr="""select relname from pg_class where relname = '%s'"""%table
- if len (self.ZSQLSimpleSearch(qstr))<1: # if not the create the table
+ if not(self.ZSQLSimpleSearch(qstr)) or (len (self.ZSQLSimpleSearch(qstr))<1): # if not the create the table
columns=[]
create=True
else:
@@ -240,7 +258,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:
@@ -269,7 +287,7 @@ class ZSQLExtendFolder(Folder,Persistent
fields=",".join(dataSet.keys())
- values=",".join([""" %s """%self.ZSQLQuote(x) for x in dataSet.keys()])
+ values=",".join([""" %s """%self.ZSQLQuote(dataSet[x]) for x in dataSet.keys()])
queryStr="""INSERT INTO %s (%s) VALUES (%s)"""%(table,fields,values)
@@ -288,103 +306,27 @@ 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':
- 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=[]
+ if node[1].nodeName==containerTagName:
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={}
@@ -457,22 +399,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:
@@ -501,10 +435,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:
@@ -632,7 +562,7 @@ class ZSQLExtendFolder(Folder,Persistent
ret+=""""""
return ret
- def ZSQLOptionsFromSearchList(self,fieldname,results,fieldName,valueName=None,start=None, multiple='',startValue=None,additionalSelect="",size=None,linelen=None):
+ def ZSQLOptionsFromSearchList(self,fieldname,results,fieldName,valueName=None,start=None, multiple='',startValue=None,additionalSelect="",size=None,linelen=None,selected=None):
"""generate select options form a search list
es wird