--- ZSQLExtend/ZSQLExtend.py 2007/07/24 09:22:14 1.117 +++ 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 @@ -77,6 +79,15 @@ def utf8ify(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): @@ -118,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 @@ -349,12 +368,13 @@ class ZSQLExtendFolder(Folder,Persistent def importXMLFileFMP(self,table,dsn=None,uploadfile=None,update_fields=None,id_field=None,sync_mode=False, - lc_names=True,keep_fields=False,replace=False,ascii_db=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. @@ -363,13 +383,14 @@ class ZSQLExtendFolder(Folder,Persistent @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.info("import %s"%uploadfile) + logging.info("importXMLFileFMP: importing %s"%uploadfile) for c in uploadfile.read(): tfile.write(c) tfile.close() @@ -378,26 +399,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 - - 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): @@ -438,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={} @@ -497,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) @@ -512,9 +604,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() @@ -587,15 +679,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: @@ -702,11 +795,11 @@ class ZSQLExtendFolder(Folder,Persistent """generate select oprions form a cr seperated list""" fields=listField.split("\n") if size: - ret=""" """%(fieldname,multiple,size) else: - ret=""" """%(fieldname,multiple) if start: if start==' ': @@ -806,7 +899,7 @@ class ZSQLExtendFolder(Folder,Persistent #print "INLINE:",argv for a in argTmp.keys(): - aFiltered=re.sub(r"^-","_",a) # beginning of a command should always be "_" + aFiltered=re.sub(r"^-","_",a) # beginning of a command should always be "_" qs.append(aFiltered+"="+urllib.quote(str(argTmp[a]))) #return [] ret = self.parseQueryString(string.join(qs,","),"_",storename=storename) @@ -840,15 +933,13 @@ class ZSQLExtendFolder(Folder,Persistent def ZSQLInlineSearch(self,storename=None,args=None,**argv): """inlinesearch""" - + #logging.debug("ZSQLInlineSearch args=%s argv=%s"%(args,argv)) qs=[] if storename: """store""" else: storename="foundCount" - - if args: argTmp=args else: @@ -862,14 +953,19 @@ class ZSQLExtendFolder(Folder,Persistent if type(argTmp[a]) is ListType: # ein parameter zweimal value="" #TODO find a better solution, currently only the last non empty entry is used. - for x in argTmp[a]: - if x: - value=x + #for x in argTmp[a]: + # if x: + # value=x + # version: join with spaces (makes sense with checkbox and -op=all) + value = " ".join(argTmp[a]) else: - + try: value=str(argTmp[a]) + except: + value=utf8ify(argTmp[a]) + qs.append(aFiltered+"="+urllib.quote(value)) - + #logging.debug("InlineSearch:"+string.join(qs,",")) #return [] @@ -894,7 +990,57 @@ class ZSQLExtendFolder(Folder,Persistent except: logger("ZSQLResetConnection",logging.ERROR, '%s %s'%sys.exc_info()[:2]) + def ZSQLSimpleSearch(self,query=None,max_rows=1000000): + """new simple search""" + logging.debug("new ZSQLSimpleSearch X %s"%query) + # get Connection instance + con = self.getConnectionObj() + # call to get db object + dbc = con() + if getattr(self, 'autocommit', False): + # force transaction isolation level (for psycopg2 0=autocommit) + logging.debug(" old tilevel="+dbc.tilevel) + dbc.tilevel = 0 + # modified code from ZPsycopgDA.db without _register: + c = dbc.getcursor() + desc = () + r = [] + try: + try: + c.execute(qs) + + except psycopg2.OperationalError: + #logging.exception("Operational error on connection, closing it.") + try: + # Only close our connection + dbc.putconn(True) + except: + #logging.debug("Something went wrong when we tried to close the pool", exc_info=True) + pass + + if c.description is not None: + if max_rows: + r = c.fetchmany(max_rows) + else: + r = c.fetchall() + desc = c.description + + dbc.failures = 0 + + except StandardError, err: + raise err + + res = (dbc.convert_description(desc), r) + + else: + # just use DA's query method + res = dbc.query(query, max_rows=max_rows) + + # return result set as Result object with Brains + return Results(res) + + def oldZSQLSimpleSearch(self,query=None,max_rows=1000000): """simple search""" logging.error("ZSQLSimpleSearch X %s"%query) #print query @@ -969,18 +1115,19 @@ class ZSQLExtendFolder(Folder,Persistent - def ZSQLAdd(self,format=None,RESPONSE=None,args=None,**argv): + def ZSQLAdd(self,format=None,RESPONSE=None,args=None,_useRequest=True,**argv): """Neuer Eintrag""" - if args: + if args: argTmp=args else: argTmp=argv qs_temp=[] - for a in self.REQUEST.form.keys(): - qs_temp.append(a+"="+urllib.quote(str(self.REQUEST.form[a]))) + if _useRequest: + for a in self.REQUEST.form.keys(): + qs_temp.append(a+"="+urllib.quote(str(self.REQUEST.form[a]))) qs=string.join(qs_temp,",") @@ -995,7 +1142,10 @@ class ZSQLExtendFolder(Folder,Persistent addList={} for q in qs.split(","): + if len(q.split("="))<2: + continue name=re.sub("r'+'"," ",q.split("=")[0].lower()) + value=q.split("=")[1] value=re.sub(r'\+'," ",value) value=urllib.unquote(value) @@ -1064,16 +1214,19 @@ class ZSQLExtendFolder(Folder,Persistent table=urllib.unquote(value) elif name=="-identify": identify=urllib.unquote(value) - identify="lower("+identify.split("=")[0]+")="+sql_quote(identify.split("=")[1].lower()) + # old code did identify with lower() which doesn't work for oids + #identify="lower("+identify.split("=")[0]+")="+sql_quote(identify.split("=")[1].lower()) + (k,v) = identify.split("=") + identify="%s=%s"%(k,sql_quote(v)) elif name=="-format": format=urllib.unquote(value) #elif (not (name[0]=="-" or name[0]=="_")) and (not len(value)==0): elif (not (name[0]=="-" or name[0]=="_")): - if value=="": - changeList.append("\""+name+"\"=null") - else: - changeList.append("\""+name+"\"="+sql_quote(urllib.unquote(value))) + if value=="": + changeList.append("\""+name+"\"=null") + else: + changeList.append("\""+name+"\"="+sql_quote(urllib.unquote(value))) changeString=string.join(changeList,",") @@ -1116,7 +1269,7 @@ class ZSQLExtendFolder(Folder,Persistent """search in database""" def delEmpty(list): - """"loesche leere elemente aus der liste""" + """loesche leere elemente aus der liste""" ret=[] for x in list: splitted=x.split("=") @@ -1216,30 +1369,25 @@ class ZSQLExtendFolder(Folder,Persistent """suche mit alten parametern bis auf die in argv getauschten""" if args: argv=args - + #get the old queries qs=self.REQUEST.SESSION[storename]['qs'] querys=qs.split(",") #which arguments are in the old query string - queryList={} for query in querys: arg=query.split("=")[0] if arg[0]=="_": arg="-"+arg[1:] # sicherstellen, dass an Anfang stets "_" try: - queryList[arg]=query.split("=")[1] + queryList[arg]=urllib.unquote_plus(query.split("=")[1]) except: queryList[arg]='' argList=[] arg="" - - - #gehe durch die zu aendernden Argumente for argTmp in argv.keys(): - arg=argTmp[0:]# sicherstellen, dass der string auh kopiert wird if arg[0]=="_": arg="-"+arg[1:] # sicherstellen, dass an Anfang stets "_" @@ -1251,10 +1399,11 @@ class ZSQLExtendFolder(Folder,Persistent str="ZSQLSearch?"+urllib.urlencode(queryList) return str + def parseQueryString(self,qs,iCT,storemax="no",select=None,nostore=None,storename="foundCount",tableExt=None,NoQuery=None,NoLimit=None,restrictField=None,restrictConnect=None,filter=None): """analysieren den QueryString""" - + logging.debug("parseQueryString qs=%s"%qs) #setzte generische werte @@ -1410,6 +1559,7 @@ class ZSQLExtendFolder(Folder,Persistent op=opfields[name] else: op="ct" + namealt=name name="LOWER("+punktsplit[1]+")" value=value.lower() @@ -1434,7 +1584,7 @@ class ZSQLExtendFolder(Folder,Persistent elif op=="numerical": term=analyseIntSearch(value) - tmp=(name+" "+term) + tmp=(namealt+" "+term) # take namealt without LOWER elif op=="grep": tmp=(name+" ~* "+sql_quote(value)) elif op=="one": @@ -1484,7 +1634,7 @@ class ZSQLExtendFolder(Folder,Persistent elif op=="numerical": term=analyseIntSearch(value) - tmp=(name+" "+term) + tmp=(namealt+" "+term) # take namealt without LOWER elif op=="grep": tmp=(name+" ~* "+sql_quote(value)) elif op=="one": @@ -1766,7 +1916,11 @@ class ZSQLExtendFolder(Folder,Persistent return "%s"%(self.REQUEST['URL']+"?"+newquerystring,html) - + def pydev_settrace(self): + """do settrace to start debugging""" + import pydevd + pydevd.settrace() + manage_addZSQLExtendFolderForm=DTMLFile('ZSQLExtendFolderAdd', globals()) @@ -2079,4 +2233,3 @@ def manage_addZSQLBibliography(self, id, -