--- ZSQLExtend/ZSQLExtend.py 2007/04/02 12:34:51 1.108 +++ ZSQLExtend/ZSQLExtend.py 2007/04/03 14:44:24 1.109 @@ -4,9 +4,8 @@ from Globals import DTMLFile,package_hom import urllib import re import string -import sys #from pyPgSQL import libpq -from AccessControl import getSecurityManager +from AccessControl import getSecurityManager,Unauthorized from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate from Products.PageTemplates.PageTemplateFile import PageTemplateFile @@ -20,11 +19,11 @@ import os import copy import unicodedata import tempfile -import logging +import sys #ersetzt logging def logger(txt,method,txt2): - """logging""" + """logging""" logging.info(txt+ txt2) @@ -322,7 +321,7 @@ class ZSQLExtendFolder(Folder,Persistent return ret - def importXMLFile(self,table,data=None,identify=None,filename=None,RESPONSE=None): + def importXMLFile(self,table,containerTagName,fieldNames,data=None,identify=None,filename=None,RESPONSE=None): #TODO: finish importXMLFile ''' Import XML file into the table @@ -332,6 +331,7 @@ class ZSQLExtendFolder(Folder,Persistent @param identify: (optional) field res. tag which identifies a entry uniquely for updating purposes. @param RESPONSE: (optional) ''' + ret="" from xml.dom.pulldom import parseString doc=parseString(file.read()) @@ -853,7 +853,7 @@ class ZSQLExtendFolder(Folder,Persistent def ZSQLSimpleSearch(self,query=None,max_rows=1000000): """simple search""" - + logging.error(query) #print query if not query: query=self.query @@ -1038,7 +1038,7 @@ class ZSQLExtendFolder(Folder,Persistent return True - def ZSQLFindIndexed(self,qs="",select="oid,*",storename=None,indexedFields=['data_line'],restrictField='id_text',**argv): + def ZSQLFindIndexed(self,tableList=[],qs="",select="oid,*",storename=None,indexedFields=['data_line'],restrictField='id_text',**argv): """find2""" for index in self.ZopeFind(self,obj_ids=indexedFields):