--- ZSQLExtend/ZSQLExtend.py 2007/02/01 14:48:59 1.101 +++ ZSQLExtend/ZSQLExtend.py 2007/02/09 17:39:44 1.102 @@ -222,7 +222,7 @@ class ZSQLExtendFolder(Folder,Persistent for fieldName in fieldNames: if type(fieldName) is UnicodeType: fieldName=fieldName.encode('utf-8') - logging.LOG("update xml: fieldname",logging.INFO,repr(fieldName)) + logging.info("update xml: fieldname",logging.INFO,repr(fieldName)) if fieldName.lower() not in columns: if create:# table does not exist therefore create with one column @@ -232,7 +232,7 @@ class ZSQLExtendFolder(Folder,Persistent qstr="""alter table %s add %s %s""" self.ZSQLSimpleSearch(qstr%(table,fieldName,'text')) - logging.LOG("update xsd: fieldname add",logging.INFO,qstr%(table,fieldName,'text')) + logger("update xsd: fieldname add",logging.INFO,qstr%(table,fieldName,'text')) def importXMLFileAccess(self,table,container,data=None,identify=None,filename=None,RESPONSE=None): @@ -246,7 +246,7 @@ class ZSQLExtendFolder(Folder,Persistent ''' from xml.dom.pulldom import parseString,parse - logging.LOG("import xml",logging.INFO,"called") + logger("import xml",logging.INFO,"called") #fh=file("/tmp/fmpxml.xml") import bz2 import base64 @@ -255,14 +255,14 @@ class ZSQLExtendFolder(Folder,Persistent if data: data=bz2.decompress(base64.decodestring(data)) - logging.LOG("import xml",logging.INFO,"received file") + logger("import xml",logging.INFO,"received file") doc=parseString(data) - logging.LOG("import xml",logging.INFO,"parsed file") + logger("import xml",logging.INFO,"parsed file") elif filename: fh=file(filename) doc=parse(fh) - logging.LOG("import xml",logging.INFO,"parsed file") + logger("import xml",logging.INFO,"parsed file") while 1: node=doc.getEvent() @@ -285,7 +285,7 @@ class ZSQLExtendFolder(Folder,Persistent field=dataSet[identify] searchStr="""select %s from %s where %s = '%s'"""%(identify,table,identify,field) - logging.LOG("import xml",logging.INFO,searchStr) + logger("import xml",logging.INFO,searchStr) search=self.ZSQLSimpleSearch(searchStr) if search: update=True @@ -299,7 +299,7 @@ class ZSQLExtendFolder(Folder,Persistent field=dataSet[identify] queryStr="""UPDATE %s SET %s WHERE %s = '%s' """%(table,setStr,identify,field) - logging.LOG("update xml",logging.INFO,queryStr) + logger("update xml",logging.INFO,queryStr) self.ZSQLSimpleSearch(queryStr) ret+="ud: %s \n"%field else: @@ -311,7 +311,7 @@ class ZSQLExtendFolder(Folder,Persistent queryStr="""INSERT INTO %s (%s) VALUES (%s)"""%(table,fields,values) self.ZSQLSimpleSearch(queryStr) - logging.LOG("update xml",logging.INFO,queryStr) + logger("update xml",logging.INFO,queryStr) @@ -352,7 +352,7 @@ class ZSQLExtendFolder(Folder,Persistent field=dataSet[nr] searchStr="""select %s from %s where %s = '%s'"""%(identify,table,identify,field) - logging.LOG("import xml",logging.INFO,searchStr) + logger("import xml",logging.INFO,searchStr) search=self.ZSQLSimpleSearch(searchStr) if search: update=True @@ -366,7 +366,7 @@ class ZSQLExtendFolder(Folder,Persistent field=dataSet[nr] queryStr="""UPDATE %s SET %s WHERE %s = '%s' """%(table,setStr,identify,field) - logging.LOG("update xml",logging.INFO,queryStr) + logger("update xml",logging.INFO,queryStr) self.ZSQLSimpleSearch(queryStr) ret+="ud: %s \n"%field else: @@ -378,7 +378,7 @@ class ZSQLExtendFolder(Folder,Persistent queryStr="""INSERT INTO %s (%s) VALUES (%s)"""%(table,fields,values) self.ZSQLSimpleSearch(queryStr) - logging.LOG("update xml",logging.INFO,queryStr) + logger("update xml",logging.INFO,queryStr) ret+="ad: %s \n"%field elif node[1].nodeName=="METADATA": @@ -390,16 +390,16 @@ class ZSQLExtendFolder(Folder,Persistent for name in names: fieldNames.append(name.getAttribute('NAME')) - logging.LOG("update xml: fieldnames",logging.INFO,repr(fieldNames)) + logger("update xml: fieldnames",logging.INFO,repr(fieldNames)) qstr="""select attname from pg_attribute, pg_class where attrelid = pg_class.oid and relname = '%s' """ columns=[x.attname for x in self.ZSQLSimpleSearch(qstr%table)] for fieldName in fieldNames: - logging.LOG("update xml: fieldname",logging.INFO,repr(fieldName)) + logger("update xml: fieldname",logging.INFO,repr(fieldName)) if fieldName not in columns: qstr="""alter table %s add %s %s""" self.ZSQLSimpleSearch(qstr%(table,fieldName,'text')) - logging.LOG("update xml: fieldname add",logging.INFO,qstr%(table,fieldName,'text')) + logger("update xml: fieldname add",logging.INFO,qstr%(table,fieldName,'text')) #fn=node[1].getAttribute("xml:id") #nf=file("xtf/"+fn+".xtf",'w') #nf.write(""""""+node[1].toxml()+"") @@ -927,11 +927,11 @@ class ZSQLExtendFolder(Folder,Persistent try: self.getConnectionObj().manage_close_connection() except: - logging.LOG("ZSQLResetConnection",logging.ERROR, '%s %s'%sys.exc_info()[:2]) + logger("ZSQLResetConnection",logging.ERROR, '%s %s'%sys.exc_info()[:2]) try: self.getConnectionObj().manage_open_connection() except: - logging.LOG("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): """simple search""" @@ -954,7 +954,7 @@ class ZSQLExtendFolder(Folder,Persistent try: self.getConnectionObj().manage_open_connection() except: - logging.LOG("ZSQLSimpleSearch",logging.ERROR, '%s %s'%sys.exc_info()[:2]) + logger("ZSQLSimpleSearch",logging.ERROR, '%s %s'%sys.exc_info()[:2]) else: try: @@ -967,7 +967,7 @@ class ZSQLExtendFolder(Folder,Persistent try: self.getConnectionObj().manage_open_connection() except: - logging.LOG("ZSQLSimpleSearch",logging.ERROR, '%s %s'%sys.exc_info()[:2]) + logger("ZSQLSimpleSearch",logging.ERROR, '%s %s'%sys.exc_info()[:2]) def getConnectionObj(self): if hasattr(self,'connection_id'): @@ -1055,7 +1055,7 @@ class ZSQLExtendFolder(Folder,Persistent else: return True - def ZSQLChange(self,format=None,RESPONSE=None,USE_FORM=None,**argv): + def ZSQLChange(self,format=None,RESPONSE=None,USE_FORM=None,args=None,**argv): """change entries""" #qs=self.REQUEST['QUERY_STRING'] # very bad hack @@ -1067,19 +1067,23 @@ class ZSQLExtendFolder(Folder,Persistent qs_temp.append(a+"="+urllib.quote(str(self.REQUEST.form[a]))) - - for field in argv.keys(): + if args: + arg_tmp=args + else: + arg_tmp=argv + + for field in arg_tmp.keys(): if field[0]=="_": fieldTmp="-"+field[1:] else: fieldTmp=field - qs_temp.append("%s=%s"%(fieldTmp,argv[field])) + qs_temp.append("%s=%s"%(fieldTmp,arg_tmp[field])) changeList=[] - + logging.info("ZSQLChange qs_temp: %s"%repr(qs_temp)) for q in qs_temp: name=urllib.unquote(re.sub("r'+'"," ",q.split("=")[0].lower())) @@ -1105,7 +1109,7 @@ class ZSQLExtendFolder(Folder,Persistent changeString=string.join(changeList,",") queryString="UPDATE %s SET %s WHERE %s"%(table,changeString,identify) - logging.LOG("ZSQLExtend",logging.INFO,"CHANGE: "+queryString) + logger("ZSQLExtend",logging.INFO,"CHANGE: "+queryString) self.ZSQLSimpleSearch(queryString) @@ -1650,7 +1654,7 @@ class ZSQLExtendFolder(Folder,Persistent def ZSQLQuery(self,query,debug=None): """query""" if debug: - logging.LOG("ZSQLQuery", logging.INFO, query) + logger("ZSQLQuery", logging.INFO, query) return self.ZSQLSimpleSearch(query)