--- ZSQLExtend/ZSQLExtend.py 2006/05/17 21:42:19 1.86
+++ ZSQLExtend/ZSQLExtend.py 2006/07/27 17:31:50 1.87
@@ -19,15 +19,6 @@ 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
@@ -81,333 +72,33 @@ class ZSQLExtendFolder(Folder,Persistent
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
- """
- from Ft.Xml import Parse
- fh=file(configFileName)
-
- doc=Parse(fh)
-
- x=doc.xpath("//pathToFolder/@path")
-
-
- if not (len(x)==1): # tag ist nich eineindeutig
- return False
-
- pathToFolder=x[0].value
-
- for db in doc.xpath("//db"):
-
- containers=db.xpath("./@container")
- identifiers=db.xpath("./@identify")
-
- print containers
- if not (len(containers)==1):
- return False
- else:
- container=containers[0].value
-
- if not (len(identifiers)==1):
- identifier=None
- else:
- identifier=identifiers[0].value
-
- self.xsdToTable(container.lower(),container,modus="drop",filename=os.path.join(pathToFolder,container.lower()+".xsd"))
- self.importXMLFileAccess(container.lower(),container,filename=os.path.join(pathToFolder,container.lower()+".xml"),identify=identifier)
-
- return "DONE"
-
- def xsdToTable(self,table,elementNameForTable,modus="update", filename=None,data=None,RESPONSE=None):
- """reads an xsd file an creates the columns of a table out of its structure
- @param table: name of the table the xml shall be imported into
- @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)
-
- """
- #from xml.dom.minidom import parseString,parse
-
- from Ft.Xml import Parse
- zLOG.LOG("import xsd",zLOG.INFO,"called")
- #fh=file("/tmp/fmpxml.xml")
- import bz2
- import base64
-
-
- ret=""
- if data:
- data=bz2.decompress(base64.decodestring(data))
-
- #zLOG.LOG("import xsd",zLOG.INFO,"received file")
- doc=Parse(data)
- #zLOG.LOG("import xsd",zLOG.INFO,"parsed file")
-
- elif filename:
- fh=file(filename)
- txt=fh.read()
-
- doc=Parse(txt)
- #zLOG.LOG("import xsd",zLOG.INFO,"parsed file")
-
-
- Nss={'xsd':'http://www.w3.org/2001/XMLSchema'}
- definingSequence=doc.xpath("""//xsd:element[@name='%s']/xsd:complexType/xsd:sequence/xsd:element/@name"""%elementNameForTable,explicitNss=Nss)
-
- fieldNames=[x.value for x in definingSequence]
-
-
-
- #check if table exists
-
- qstr="""select relname from pg_class where relname = '%s'"""%table
- if not(self.ZSQLSimpleSearch(qstr)) or (len (self.ZSQLSimpleSearch(qstr))<1): # if not the create the table
- columns=[]
- create=True
- else:
- create=False
-
- zLOG.LOG("update xsd: 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)]
-
-
- if (modus=="drop") and (not create): #table shall be deleted, therefore it should exist (not create)
- print "drop"
- qstr="""DROP TABLE %s """
- self.ZSQLSimpleSearch(qstr%table)
- columns=[]
- create=True
-
- for fieldName in fieldNames:
- if type(fieldName) is UnicodeType:
- fieldName=fieldName.encode('utf-8')
- zLOG.LOG("update xml: fieldname",zLOG.INFO,repr(fieldName))
- if fieldName.lower() not in columns:
-
- if create:# table does not exist therefore create with one column
- qstr="""create table %s (%s %s)"""
- create=False
- else:# otherwise add the field
- 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'))
-
-
- def importXMLFileAccess(self,table,container,data=None,identify=None,filename=None,RESPONSE=None):
- '''
- Import XML file in access format 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 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")
-
- 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.lower()==container.lower(): # make everything case insensitive
- doc.expandNode(node[1])
-
- dataSet={}
- for col in node[1].childNodes:
- if col.nodeType is col.ELEMENT_NODE:
- data=col.nodeName
- dataSet[data]=getTextFromNode(col)
- print dataSet.keys()
- update=False
-
- if identify:
-
- field=dataSet[identify]
-
- 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 dataSet.keys():
- tmp.append("""%s = %s"""%(fieldName,self.ZSQLQuote(dataSet[fieldName])))
- setStr=",".join(tmp)
-
- field=dataSet[identify]
-
- 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(dataSet.keys())
- values=",".join([""" %s """%self.ZSQLQuote(dataSet[x]) for x in dataSet.keys()])
-
-
- queryStr="""INSERT INTO %s (%s) VALUES (%s)"""%(table,fields,values)
- self.ZSQLSimpleSearch(queryStr)
- zLOG.LOG("update xml",zLOG.INFO,queryStr)
-
-
-
-
- return ret
-
-
- def importXMLFile(self,table,data=None,identify=None,filename=None,RESPONSE=None):
+ def importXMLFile(self,table,containerTagName,file,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 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")
-
- elif filename:
- fh=file(filename)
- doc=parse(fh)
- zLOG.LOG("import xml",zLOG.INFO,"parsed file")
+ from xml.dom.pulldom import parseString
+
+ 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=[]
- 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={}
@@ -480,22 +171,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 +207,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:
@@ -655,7 +334,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,selected=None):
+ def ZSQLOptionsFromSearchList(self,fieldname,results,fieldName,valueName=None,start=None, multiple='',startValue=None,additionalSelect="",size=None,linelen=None):
"""generate select options form a search list
es wird