--- ZSQLExtend/ZSQLExtend.py 2010/02/15 19:10:23 1.133 +++ ZSQLExtend/ZSQLExtend.py 2011/02/23 20:05:51 1.142 @@ -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 @@ -369,7 +372,7 @@ 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 (may be comma-separated list) @@ -384,7 +387,7 @@ 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') @@ -448,12 +451,19 @@ class ZSQLExtendFolder(Folder,Persistent logger.addHandler(loghandler) options.use_logger_instance = logger - importFMPXML(options) - logging.info("importXMLFileFMP: done") + 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() - RESPONSE.write("\n\n DONE!") + 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) @@ -499,7 +509,7 @@ class ZSQLExtendFolder(Folder,Persistent def URLquote(self,txt): - """urlquote" + """urlquote @param txt: text der urlgequoted werden soll. """ return urllib.quote(txt) @@ -579,12 +589,13 @@ class ZSQLExtendFolder(Folder,Persistent return pt() - def changeZSQLExtend(self,label,description,weight=0,connection_id=None,REQUEST=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) @@ -923,15 +934,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: @@ -945,14 +954,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 [] @@ -977,7 +991,58 @@ 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 %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=%s"%dbc.tilevel) + dbc.tilevel = 0 + # modified code from ZPsycopgDA.db without _register: + c = dbc.getcursor() + desc = () + r = [] + try: + try: + c.execute(query) + + 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: + logging.debug(" no autocommit") + # 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 @@ -1206,7 +1271,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("=") @@ -1340,7 +1405,7 @@ class ZSQLExtendFolder(Folder,Persistent 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 @@ -1496,6 +1561,7 @@ class ZSQLExtendFolder(Folder,Persistent op=opfields[name] else: op="ct" + namealt=name name="LOWER("+punktsplit[1]+")" value=value.lower() @@ -1852,7 +1918,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()) @@ -2165,4 +2235,3 @@ def manage_addZSQLBibliography(self, id, -