version 1.137, 2011/02/11 19:08:49
|
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 |
|
|
from Products.ZSQLMethods.SQL import SQLConnectionIDs |
from Products.ZSQLMethods.SQL import SQLConnectionIDs |
|
from Shared.DC.ZRDB.Results import Results |
|
|
from xml.sax.saxutils import escape |
from xml.sax.saxutils import escape |
from types import * |
from types import * |
import Shared.DC.ZRDB.DA |
import Shared.DC.ZRDB.DA |
Line 586 class ZSQLExtendFolder(Folder,Persistent
|
Line 589 class ZSQLExtendFolder(Folder,Persistent
|
return pt() |
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""" |
"""change the Konfiguration""" |
self.connection_id=connection_id |
self.connection_id=connection_id |
self.weight=weight |
self.weight=weight |
self.label=label |
self.label=label |
self.description=description |
self.description=description |
|
self.autocommit = (autocommit == "on") |
|
|
if REQUEST is not None: |
if REQUEST is not None: |
return self.manage_main(self, REQUEST) |
return self.manage_main(self, REQUEST) |
Line 987 class ZSQLExtendFolder(Folder,Persistent
|
Line 991 class ZSQLExtendFolder(Folder,Persistent
|
except: |
except: |
logger("ZSQLResetConnection",logging.ERROR, '%s %s'%sys.exc_info()[:2]) |
logger("ZSQLResetConnection",logging.ERROR, '%s %s'%sys.exc_info()[:2]) |
|
|
|
|
def ZSQLSimpleSearch(self,query=None,max_rows=1000000): |
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""" |
"""simple search""" |
logging.error("ZSQLSimpleSearch X %s"%query) |
logging.error("ZSQLSimpleSearch X %s"%query) |
#print query |
#print query |