--- ZSQLExtend/ZSQLExtend.py 2007/11/13 20:01:23 1.122
+++ ZSQLExtend/ZSQLExtend.py 2012/09/03 13:06:11 1.144
@@ -5,11 +5,14 @@ import urllib
import re
import string
#from pyPgSQL import libpq
+import psycopg2
from AccessControl import getSecurityManager,Unauthorized
from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate
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
@@ -96,8 +99,8 @@ def sql_quote(v):
v=string.join(string.split(v,dkey),quote_dict[dkey])
return "'%s'" % v
-def showSQLConnectionIDs(self):
- return SQLConnectionIDs(self)
+#def showSQLConnectionIDs(self):
+# return SQLConnectionIDs(self)
class Options:
"""options class"""
@@ -123,11 +126,54 @@ class ZSQLExtendFolder(Folder,Persistent
"""
meta_type="ZSQLExtendFolder"
+ #primaryKeys={}
+ #primaryKey=
+
+ def getSQLConnectionIDs(self):
+ logging.debug(SQLConnectionIDs(self))
+ return SQLConnectionIDs(self)
+
+ def getPrimaryKey(self,table=None):
+ """returns primary key for the database"""
+ if table is None:
+ return getattr(self,'primaryKey','oid')
+
+
+
+ pks= getattr(self, "primaryKeys",{})
+
+ k = pks.get(table,None)
+
+ if k is None:
+ logging.debug("getPrimaryKey: no primary key for table %s stored use standard key %s"%(table,getattr(self,'primaryKey','oid')))
+ logging.debug(pks)
+ return getattr(self,'primaryKey','oid')
+
+ return k
+
+
+ def getPrimaryKeysAsString(self):
+ """get all keys"""
+
+ if not hasattr(self, 'primaryKeys'):
+ return ""
+
+ return ";".join(["%s:%s"%val for val in self.primaryKeys.items()])
+
+
def ZSQLQuote(self,str):
"""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
@@ -152,11 +198,11 @@ class ZSQLExtendFolder(Folder,Persistent
qstr="""alter table %s add %s %s"""
self.ZSQLSimpleSearch(qstr%(table,newFieldName,'text'))
- qstr="select oid,%s from %s"%(fieldname,table)
+ qstr="select %s from %s"%(fieldname,table)
for result in self.ZSQLSimpleSearch(qstr):
- qstr="update %s set %s = %s where oid = %s"
+ qstr="update %s set %s = %s where "+self.getPrimaryKey()+" = %s"
- self.ZSQLSimpleSearch(qstr%(table,newFieldName,self.ZSQLQuote(normal(getattr(result,fieldname))),result.oid))
+ self.ZSQLSimpleSearch(qstr%(table,newFieldName,self.ZSQLQuote(normal(getattr(result,fieldname))),getattr(result,self.getPrimaryKey)))
def importAccessModell(self,configFileName,RESPONSE=None):
"""import tables from access
@@ -361,10 +407,10 @@ class ZSQLExtendFolder(Folder,Persistent
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.
@@ -376,11 +422,11 @@ class ZSQLExtendFolder(Folder,Persistent
@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.info("import %s"%uploadfile)
+ logging.info("importXMLFileFMP: importing %s"%uploadfile)
for c in uploadfile.read():
tfile.write(c)
tfile.close()
@@ -389,46 +435,75 @@ 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.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
- RESPONSE.setHeader("Content-Type","text/plain; charset=utf-8")
- RESPONSE.write("Import FMPXML file...\n\n")
- 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
-
- 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
+ logging.debug(options)
+ 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 log_to_response:
- loghandler.flush()
- RESPONSE.write("\n\n DONE!")
- return
-
- if RESPONSE and redirect_url:
- RESPONSE.redirect(redirect_url)
def generateIndex(self,field,index_name,table,RESPONSE=None):
@@ -439,7 +514,7 @@ class ZSQLExtendFolder(Folder,Persistent
index={}
- founds=self.ZSQLSimpleSearch("""SELECT %s,oid FROM %s """%(field,table))
+ founds=self.ZSQLSimpleSearch("""SELECT %s FROM %s """%(field,table))
for found in founds:
tmp=getattr(found,field,None)
@@ -447,9 +522,9 @@ class ZSQLExtendFolder(Folder,Persistent
strings=tmp.split(" ")
for string in strings:
if index.get(string):
- index[string].append(found.oid)
+ index[string].append(gettr(found,self.getPrimaryKey()))
else:
- index[string]=[found.oid]
+ index[string]=[gettr(found,self.getPrimaryKey())]
RESPONSE.write(string+"\n")
if not hasattr(self,index_name):
@@ -469,7 +544,7 @@ class ZSQLExtendFolder(Folder,Persistent
def URLquote(self,txt):
- """urlquote"
+ """urlquote
@param txt: text der urlgequoted werden soll.
"""
return urllib.quote(txt)
@@ -477,6 +552,7 @@ class ZSQLExtendFolder(Folder,Persistent
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:
@@ -485,6 +561,7 @@ class ZSQLExtendFolder(Folder,Persistent
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'):
@@ -547,13 +624,29 @@ class ZSQLExtendFolder(Folder,Persistent
return pt()
- def changeZSQLExtend(self,label,description,weight=0,connection_id=None,REQUEST=None,):
+ def changeZSQLExtend(self,label,description,primaryKey,primaryKeys="",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")
+ self.primaryKey=primaryKey
+ if primaryKeys.lstrip().rstrip()!="":
+
+ for vals in primaryKeys.split(";"):
+ splitted=vals.split(":")
+ if len(splitted)<2:
+ if REQUEST is not None:
+ return """
Wrong Syntax of keystring: %s %s is not of the form TABLE:key."""%(primaryKeys,vals)
+
+ self.primaryKeys[splitted[0]]=splitted[1]
+
+
+
+
+
if REQUEST is not None:
return self.manage_main(self, REQUEST)
@@ -562,9 +655,9 @@ 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
"""
- #logging.debug("formatascii str=%s url=%s"%(repr(str),repr(url)))
+ #logging.debug("formatascii str=%s url=%s"%(repr(str),repr(url)))
- if not str:
+ if not str:
return ""
str=str.rstrip().lstrip()
@@ -637,15 +730,16 @@ class ZSQLExtendFolder(Folder,Persistent
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:
@@ -752,11 +846,11 @@ class ZSQLExtendFolder(Folder,Persistent
"""generate select oprions form a cr seperated list"""
fields=listField.split("\n")
if size:
- ret="""