--- ZSQLExtend/ZSQLExtend.py 2011/02/23 19:43:04 1.141 +++ ZSQLExtend/ZSQLExtend.py 2011/02/23 20:05:51 1.142 @@ -5,6 +5,7 @@ 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 @@ -993,14 +994,14 @@ class ZSQLExtendFolder(Folder,Persistent def ZSQLSimpleSearch(self,query=None,max_rows=1000000): """new simple search""" - logging.debug("new ZSQLSimpleSearch X %s"%query) + 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="+dbc.tilevel) + logging.debug(" old tilevel=%s"%dbc.tilevel) dbc.tilevel = 0 # modified code from ZPsycopgDA.db without _register: c = dbc.getcursor() @@ -1008,7 +1009,7 @@ class ZSQLExtendFolder(Folder,Persistent r = [] try: try: - c.execute(qs) + c.execute(query) except psycopg2.OperationalError: #logging.exception("Operational error on connection, closing it.") @@ -1033,7 +1034,8 @@ class ZSQLExtendFolder(Folder,Persistent res = (dbc.convert_description(desc), r) - else: + else: + logging.debug(" no autocommit") # just use DA's query method res = dbc.query(query, max_rows=max_rows)