version 1.141, 2011/02/23 19:43:04
|
version 1.142, 2011/02/23 20:05:51
|
Line 5 import urllib
|
Line 5 import urllib
|
import re |
import re |
import string |
import string |
#from pyPgSQL import libpq |
#from pyPgSQL import libpq |
|
import psycopg2 |
from AccessControl import getSecurityManager,Unauthorized |
from AccessControl import getSecurityManager,Unauthorized |
from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate |
from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate |
from Products.PageTemplates.PageTemplateFile import PageTemplateFile |
from Products.PageTemplates.PageTemplateFile import PageTemplateFile |
Line 993 class ZSQLExtendFolder(Folder,Persistent
|
Line 994 class ZSQLExtendFolder(Folder,Persistent
|
|
|
def ZSQLSimpleSearch(self,query=None,max_rows=1000000): |
def ZSQLSimpleSearch(self,query=None,max_rows=1000000): |
"""new simple search""" |
"""new simple search""" |
logging.debug("new ZSQLSimpleSearch X %s"%query) |
logging.debug("new ZSQLSimpleSearch %s"%query) |
# get Connection instance |
# get Connection instance |
con = self.getConnectionObj() |
con = self.getConnectionObj() |
# call to get db object |
# call to get db object |
dbc = con() |
dbc = con() |
if getattr(self, 'autocommit', False): |
if getattr(self, 'autocommit', False): |
# force transaction isolation level (for psycopg2 0=autocommit) |
# force transaction isolation level (for psycopg2 0=autocommit) |
logging.debug(" old tilevel="+dbc.tilevel) |
logging.debug(" old tilevel=%s"%dbc.tilevel) |
dbc.tilevel = 0 |
dbc.tilevel = 0 |
# modified code from ZPsycopgDA.db without _register: |
# modified code from ZPsycopgDA.db without _register: |
c = dbc.getcursor() |
c = dbc.getcursor() |
Line 1008 class ZSQLExtendFolder(Folder,Persistent
|
Line 1009 class ZSQLExtendFolder(Folder,Persistent
|
r = [] |
r = [] |
try: |
try: |
try: |
try: |
c.execute(qs) |
c.execute(query) |
|
|
except psycopg2.OperationalError: |
except psycopg2.OperationalError: |
#logging.exception("Operational error on connection, closing it.") |
#logging.exception("Operational error on connection, closing it.") |
Line 1034 class ZSQLExtendFolder(Folder,Persistent
|
Line 1035 class ZSQLExtendFolder(Folder,Persistent
|
res = (dbc.convert_description(desc), r) |
res = (dbc.convert_description(desc), r) |
|
|
else: |
else: |
|
logging.debug(" no autocommit") |
# just use DA's query method |
# just use DA's query method |
res = dbc.query(query, max_rows=max_rows) |
res = dbc.query(query, max_rows=max_rows) |
|
|