--- ZSQLExtend/ZSQLExtend.py 2005/01/12 19:13:34 1.53 +++ ZSQLExtend/ZSQLExtend.py 2005/01/25 19:30:11 1.56 @@ -1,17 +1,20 @@ from OFS.Folder import Folder -from Globals import Persistent from Acquisition import Implicit -from Globals import DTMLFile,package_home +from Globals import DTMLFile,package_home,Persistent import urllib import re import string +import sys #from pyPgSQL import libpq from AccessControl import getSecurityManager -import os.path + from Products.PageTemplates.PageTemplateFile import PageTemplateFile from Products.ZSQLMethods.SQL import SQLConnectionIDs import Shared.DC.ZRDB.DA +import zLOG +import os.path +import os def analyseIntSearch(word): #analyse integer searches @@ -307,8 +310,31 @@ class ZSQLExtendFolder(Folder,Persistent #print "INLINE:",query return self.ZSQLSimpleSearch(query) - def ZSQLSimpleSearch(self,query=None): + """simple search""" + if not query: + query=self.query + + if (hasattr(self,"_v_searchSQL") and (self._v_searchSQL == None)) or (not hasattr(self,"_v_searchSQL")): + self._v_searchSQL=Shared.DC.ZRDB.DA.DA("_v_searchSQL","_v_searchSQL",self.connection_id,"var","") + + try: + return self._v_searchSQL.__call__(var=query) + except : + if sys.exc_info()[0]=="Database Error": + try: + getattr(self,self.connection_id).manage_open_connection() + except: pass + else: + try: + return self._v_searchSQL.__call__(var=query) + except : + if sys.exc_info()[0]=="Database Error": + try: + getattr(self,self.connection_id).manage_open_connection() + except: pass + + def ZSQLSimpleSearch2(self,query=None): """ returrn SQLSearch""" #print "hi",query if not query: @@ -1256,9 +1282,13 @@ class ZSQLBibliography(Folder,ZSQLExtend def getMetaDataXML(self): """crate index meta""" - pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','record.xml')).__of__(self) - pt.content_type="text/xml" - return pt() + find=self.ZopeFind(self,obj_ids=["record.xml"]) + if not find: + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','record.xml')).__of__(self) + pt.content_type="text/xml" + return pt() + else: + return find[0][1]() def createVLMAtripels(self): """index"""