--- ZSQLExtend/ZSQLExtend.py 2007/04/20 06:36:01 1.114
+++ ZSQLExtend/ZSQLExtend.py 2011/02/23 19:43:04 1.141
@@ -10,6 +10,8 @@ from Products.PageTemplates.ZopePageTemp
from Products.PageTemplates.PageTemplateFile import PageTemplateFile
from Products.ZSQLMethods.SQL import SQLConnectionIDs
+from Shared.DC.ZRDB.Results import Results
+
from xml.sax.saxutils import escape
from types import *
import Shared.DC.ZRDB.DA
@@ -56,6 +58,36 @@ def analyseIntSearch(word):
else:
return "BETWEEN "+splitted[0]+" AND "+splitted[1]
+def unicodify(str):
+ """decode str (utf-8 or latin-1 representation) into unicode object"""
+ if not str:
+ return u""
+ if type(str) is StringType:
+ try:
+ return str.decode('utf-8')
+ except:
+ return str.decode('latin-1')
+ else:
+ return str
+
+def utf8ify(str):
+ """encode unicode object or string into byte string in utf-8 representation"""
+ if not str:
+ return ""
+ if type(str) is StringType:
+ return str
+ else:
+ return str.encode('utf-8')
+
+
+def setPsycopg2UseUnicode():
+ """force Psycopg2DA to return unicode objects"""
+ try:
+ import psycopg2
+ import psycopg2.extensions
+ psycopg2.extensions.register_type(psycopg2.extensions.UNICODE)
+ except:
+ logging.error("Unable to force psycopg2 to use unicode")
def sql_quote(v):
@@ -97,7 +129,15 @@ class ZSQLExtendFolder(Folder,Persistent
"""quote str for sql"""
return sql_quote(str)
-
+ def unicodify(self, s):
+ """return unicode object for string (utf-8 or latin1) or unicode object s"""
+ return unicodify(s)
+
+ def utf8ify(self, s):
+ """return utf-8 encoded string object for string or unicode object s"""
+ return utf8ify(s)
+
+
def normalizeField(self,table,fieldname, newFieldName=None,mode="alter", RESPONSE=None):
"""normalize a field, d.h. entfernt alle diakritischen Zeichen und ersetzt diese
durch den Grundbuchstaben in einer Spalte einer Tabelle
@@ -314,9 +354,8 @@ class ZSQLExtendFolder(Folder,Persistent
logger("update xml",logging.INFO,queryStr)
self.ZSQLSimpleSearch(queryStr)
ret+="ud: %s \n"%field
- else:
-
+ else:
fields=",".join(dataSet.keys())
values=",".join([""" %s """%self.ZSQLQuote(dataSet[x]) for x in dataSet.keys()])
@@ -325,116 +364,33 @@ class ZSQLExtendFolder(Folder,Persistent
self.ZSQLSimpleSearch(queryStr)
logger("update xml",logging.INFO,queryStr)
-
-
-
return ret
- def importXMLFile(self,table,containerTagName,fieldNames,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 identify: (optional) field res. tag which identifies a entry uniquely for updating purposes.
- @param RESPONSE: (optional)
- '''
- ret=""
- 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==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)
- logger("import xml",logging.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)
- logger("update xml",logging.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)
- logger("update xml",logging.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'))
-
- logger("update xml: fieldnames",logging.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:
- logger("update xml: fieldname",logging.INFO,repr(fieldName))
- if fieldName not in columns:
- qstr="""alter table %s add %s %s"""
- self.ZSQLSimpleSearch(qstr%(table,fieldName,'text'))
- logger("update xml: fieldname add",logging.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
-
-
- def importXMLFileFMP(self,table,dsn=None,uploadfile=None,update_fields=None,id_field=None,sync_mode=False,replace=False,redirect_url=None,ascii_db=False,RESPONSE=None):
- '''
+ def importXMLFileFMP(self,table,dsn=None,uploadfile=None,update_fields=None,id_field=None,sync_mode=False,
+ lc_names=True,keep_fields=False,ascii_db=False,replace=False,backup=False,
+ debug=False,log_to_response=False,
+ redirect_url=None,RESPONSE=None):
+ """
Import FileMaker XML file (FMPXMLRESULT format) into the table.
@param dsn: database connection string
- @param table: name of the table the xml shall be imported into
+ @param table: name of the table the xml shall be imported into (may be comma-separated list)
@param uploadfile: xmlfile file
@param update_fields: (optional) list of fields to update; default is to create all fields
@param id_field: (optional) field which uniquely identifies an entry for updating purposes.
@param sync_mode: (optional) really synchronise, i.e. delete entries not in XML file
+ @param lc_names: (optional) lower case and clean up field names from XML
+ @param keep_fields: (optional) don't add fields to SQL database
+ @param ascii_db: (optional) assume ascii encoding in db
+ @param replace: (optional) delete and re-insert data
+ @param backup: (optional) create backup of old table (breaks indices)
@param RESPONSE: (optional)
@param redirect_url: (optional) url for redirecting after the upload is done
- '''
+ """
tfilehd,filename=tempfile.mkstemp()
tfile=os.fdopen(tfilehd,'w')
- logging.error("import %s"%uploadfile)
+ logging.info("importXMLFileFMP: importing %s"%uploadfile)
for c in uploadfile.read():
tfile.write(c)
tfile.close()
@@ -443,23 +399,76 @@ class ZSQLExtendFolder(Folder,Persistent
if not dsn:
dsn=self.getConnectionObj().connection_string
-
- options=Options()
- options.dsn=dsn
- options.table=table
- options.filename=filename
- options.update_fields=update_fields
- options.id_field=id_field
- options.sync_mode=sync_mode
- options.replace_table=replace
- options.lc_names=True
- options.ascii_db=ascii_db
- importFMPXML(options)
+ logging.debug("dsn: %s"%dsn)
+ logging.debug("table: %s"%table)
+ logging.debug("update_fields: %s"%update_fields)
+ logging.debug("id_field: %s"%id_field)
+ logging.debug("sync_mode: %s"%sync_mode)
+ logging.debug("lc_names: %s"%lc_names)
+ logging.debug("keep_fields: %s"%keep_fields)
+ logging.debug("ascii_db: %s"%ascii_db)
+ logging.debug("replace: %s"%replace)
+ logging.debug("backup: %s"%backup)
+ logging.debug("debug: %s"%debug)
+ logging.debug("log_to_response: %s"%log_to_response)
+ logging.debug("RESPONSE: %s"%repr(RESPONSE))
+
+ tablelist=table.split(',')
+ logging.debug("tablelist: %s"%tablelist)
+ #table=tables
+
+ for t in tablelist :
+ logging.debug("table: %s"%table)
+ options=Options()
+ options.dsn=dsn
+ options.table=t
+ options.filename=filename
+ options.update_fields=update_fields
+ options.id_field=id_field
+ options.sync_mode=sync_mode
+ options.lc_names=lc_names
+ options.replace_table=replace
+ options.keep_fields=keep_fields
+ options.ascii_db=ascii_db
+ options.replace_table=replace
+ options.backup_table=backup
+ options.debug=debug
+
+ if RESPONSE and log_to_response:
+ # set up logging to response as plain text
+ logging.debug("Setting up logging to RESPONSE")
+ RESPONSE.setHeader("Content-Type","text/plain; charset=utf-8")
+ RESPONSE.write("Import FMPXML file...\n\n")
+ RESPONSE.flush()
+ loghandler = logging.StreamHandler(RESPONSE)
+ if debug:
+ loghandler.setLevel(logging.DEBUG)
+ else:
+ loghandler.setLevel(logging.INFO)
+ logger = logging.getLogger('db.import.fmpxml')
+ logger.addHandler(loghandler)
+ options.use_logger_instance = logger
+
+ try:
+ err = None
+ importFMPXML(options)
+ logging.info("importXMLFileFMP: done")
+ except Exception, err:
+ logging.error("Error importing: %s"%err)
+
+ if RESPONSE and log_to_response:
+ loghandler.flush()
+ if err is not None:
+ RESPONSE.write("\n\nERROR while importing: %s"%err)
+ else:
+ RESPONSE.write("\n\n DONE!")
+
+ elif RESPONSE and redirect_url:
+ RESPONSE.redirect(redirect_url)
+
os.remove(filename)
-
- if RESPONSE and redirect_url:
- RESPONSE.redirect(redirect_url)
+
def generateIndex(self,field,index_name,table,RESPONSE=None):
"""erzeuge ein Index Objekt einem Feld (experimental)
@@ -499,11 +508,32 @@ class ZSQLExtendFolder(Folder,Persistent
def URLquote(self,txt):
- """urlquote"
+ """urlquote
@param txt: text der urlgequoted werden soll.
"""
return urllib.quote(txt)
+
+ def createIdSet(self, resultset, idField=None):
+ """returns a (frozen)set of IDs from a SQL-resultset (using idField) or a list (if idField=None)"""
+ logging.debug("createidset for idfield %s"%idField)
+ if idField is None:
+ return frozenset(resultset)
+ else:
+ idlist = [r[idField] for r in resultset]
+ return frozenset(idlist)
+
+ def opIdSet(self, a, b, op):
+ """operate on sets a and b"""
+ logging.debug("opidset with op %s"%op)
+ if (op == 'intersect'):
+ return a.intersection(b)
+ elif (op == 'union'):
+ return a.union(b)
+ elif (op == 'diff'):
+ return a.difference(b)
+
+
def searchRel(self,relStatement,statement,wherePart,classes):
"""suche relative haufigkeiten (experimental)"""
ret={}
@@ -558,13 +588,14 @@ class ZSQLExtendFolder(Folder,Persistent
return pt()
- def changeZSQLExtend(self,label,description,weight=0,REQUEST=None,connection_id=None):
+ def changeZSQLExtend(self,label,description,weight=0,connection_id=None,autocommit=None,REQUEST=None,):
"""change the Konfiguration"""
self.connection_id=connection_id
self.weight=weight
self.label=label
self.description=description
-
+ self.autocommit = (autocommit == "on")
+
if REQUEST is not None:
return self.manage_main(self, REQUEST)
@@ -573,7 +604,11 @@ class ZSQLExtendFolder(Folder,Persistent
@param str: string der Formatiert werden soll.
@param url: (optional) default ist "None", sonderfall erzeugt einen Link aus String mit unterliegender url
"""
- #url=None
+ #logging.debug("formatascii str=%s url=%s"%(repr(str),repr(url)))
+
+ if not str:
+ return ""
+
str=str.rstrip().lstrip()
if url and str:
@@ -587,7 +622,9 @@ class ZSQLExtendFolder(Folder,Persistent
retStr+="""%s """%(strUrl,word)
str=retStr
if str:
- return re.sub(r"[\n]"," ",str)
+ retStr = re.sub(r"[\n]"," ",str)
+ #logging.debug("formatascii out=%s"%(repr(retStr)))
+ return retStr
else:
return ""
@@ -639,18 +676,19 @@ class ZSQLExtendFolder(Folder,Persistent
return 1
return 0
- def ZSQLMultiSearch(self,_table,_searchField,_value,_idField,_additionalStatement="",_select=None,_storename=None):
+ def ZSQLMultiSearch(self,_table,_searchField,_value,_idField,_additionalStatement="",_select=None,_subselectAddition="",_storename=None):
"""
Durchsucht in einer Tabelle "table" die Spalte "searchfield" nach dem allen Vorkommnissen
- von Worten in value und gibt alle Werte mit gleichem id field zurŸck, d.h. es wird die "und" suche Ÿber mehrere Eintrsege in einer
+ von Worten in value und gibt alle Werte mit gleichem id field zurueck, d.h. es wird die "und" suche ueber mehrere Eintrsege in einer
Tabelle mit gleichem idField werd realisiert,
- z.B. fŸr simplesearch ueber mehrere Felder
+ z.B. fuer simplesearch ueber mehrere Felder
@param _table: Tabelle, die durchsucht werden soll.
@param _searchField: Feld, das durchsucht wird
@param _value: String der gesucht werden soll, gesucht wird nach allen Worten des Strings, die durch " "-getrennt sind.
- @param _idField: Feld mit id fŸr die identifikation gleicher EintrŠge
- @param _additionalStatement: (optional) Zusaetzliches SQL Statement, dass zwischen dem ersten "select from" und dem ersten "where" eingegefŸgt wird.
- @param _select: (optional) Alternativer Wert fŸr den ersten SELECT Aufruf.
+ @param _idField: Feld mit id fuer die identifikation gleicher Eintraege
+ @param _additionalStatement: (optional) Zusaetzliches SQL Statement, dass zwischen dem ersten "select from" und dem ersten "where" eingegefuegt wird.
+ @param _subselectAddition: (optiona) Zusaetliche SQL Statement die hinter das select statement der subselects eingefuegt werde.
+ @param _select: (optional) Alternativer Wert fuer den ersten SELECT Aufruf.
@param _storename: (optional) Name fuer die Zwischenspeicherung von Werten in der Session
"""
if _storename:
@@ -664,17 +702,16 @@ class ZSQLExtendFolder(Folder,Persistent
if not _select:
_select=_idField
- queries.append("select %s from %s %s where lower(%s) like '%%%s%%'"%(_select,_table,_additionalStatement,_searchField,splitted[0].lower()))
+ query="select %s from %s %s where lower(%s) like '%%%s%%'"%(_select,_table,_additionalStatement,_searchField,splitted[0].lower())
- if len(splitted)>1:
+ if len(splitted)>1: # mehr als ein Wort
+ query+=" and %s in"%_idField # dann einschraenken
for v in splitted[1:]:
- queries.append("select %s from %s where lower(%s) like '%%%s%%'"%(_idField,_table,_searchField,v.lower()))
+ queries.append("select %s from %s %s where lower(%s) like '%%%s%%'"%(_idField,_table,_subselectAddition,_searchField,v.lower()))
- q=" and %s in ("%_idField
- query=q.join(queries) # nun baue sie zusammen
- for i in range(len(queries)-1):
- query+=")" #noch die klammern schliessen
+ intersect=" intersect ".join(queries) # nun baue sie zusammen
+ query+="(%s)"%intersect
logging.info("ZSQLSimple: %s"%query)
@@ -758,11 +795,11 @@ class ZSQLExtendFolder(Folder,Persistent
"""generate select oprions form a cr seperated list"""
fields=listField.split("\n")
if size:
- ret="""