ZSQLExtend/ZSQLExtend.py - diff

Return to ZSQLExtend.py CVS log

Up to [Repository] / ZSQLExtend

Diff for /ZSQLExtend/ZSQLExtend.py between versions 1.100 and 1.103

version 1.100, 2007/01/31 14:32:52	version 1.103, 2007/02/20 16:00:03
Line 222 class ZSQLExtendFolder(Folder,Persistent	Line 222 class ZSQLExtendFolder(Folder,Persistent
for fieldName in fieldNames:	for fieldName in fieldNames:
if type(fieldName) is UnicodeType:	if type(fieldName) is UnicodeType:
fieldName=fieldName.encode('utf-8')	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 fieldName.lower() not in columns:

if create:# table does not exist therefore create with one column	if create:# table does not exist therefore create with one column
Line 232 class ZSQLExtendFolder(Folder,Persistent	Line 232 class ZSQLExtendFolder(Folder,Persistent
qstr="""alter table %s add %s %s"""	qstr="""alter table %s add %s %s"""

self.ZSQLSimpleSearch(qstr%(table,fieldName,'text'))	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):	def importXMLFileAccess(self,table,container,data=None,identify=None,filename=None,RESPONSE=None):
Line 246 class ZSQLExtendFolder(Folder,Persistent	Line 246 class ZSQLExtendFolder(Folder,Persistent
'''	'''
from xml.dom.pulldom import parseString,parse	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")	#fh=file("/tmp/fmpxml.xml")
import bz2	import bz2
import base64	import base64
Line 255 class ZSQLExtendFolder(Folder,Persistent	Line 255 class ZSQLExtendFolder(Folder,Persistent
if data:	if data:
data=bz2.decompress(base64.decodestring(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)	doc=parseString(data)
logging.LOG("import xml",logging.INFO,"parsed file")	logger("import xml",logging.INFO,"parsed file")

elif filename:	elif filename:
fh=file(filename)	fh=file(filename)
doc=parse(fh)	doc=parse(fh)
logging.LOG("import xml",logging.INFO,"parsed file")	logger("import xml",logging.INFO,"parsed file")
while 1:	while 1:
node=doc.getEvent()	node=doc.getEvent()

Line 285 class ZSQLExtendFolder(Folder,Persistent	Line 285 class ZSQLExtendFolder(Folder,Persistent
field=dataSet[identify]	field=dataSet[identify]

searchStr="""select %s from %s where %s = '%s'"""%(identify,table,identify,field)	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)	search=self.ZSQLSimpleSearch(searchStr)
if search:	if search:
update=True	update=True
Line 299 class ZSQLExtendFolder(Folder,Persistent	Line 299 class ZSQLExtendFolder(Folder,Persistent
field=dataSet[identify]	field=dataSet[identify]

queryStr="""UPDATE %s SET %s WHERE %s = '%s' """%(table,setStr,identify,field)	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)	self.ZSQLSimpleSearch(queryStr)
ret+="ud: %s \n"%field	ret+="ud: %s \n"%field
else:	else:
Line 311 class ZSQLExtendFolder(Folder,Persistent	Line 311 class ZSQLExtendFolder(Folder,Persistent

queryStr="""INSERT INTO %s (%s) VALUES (%s)"""%(table,fields,values)	queryStr="""INSERT INTO %s (%s) VALUES (%s)"""%(table,fields,values)
self.ZSQLSimpleSearch(queryStr)	self.ZSQLSimpleSearch(queryStr)
logging.LOG("update xml",logging.INFO,queryStr)	logger("update xml",logging.INFO,queryStr)



Line 352 class ZSQLExtendFolder(Folder,Persistent	Line 352 class ZSQLExtendFolder(Folder,Persistent
field=dataSet[nr]	field=dataSet[nr]

searchStr="""select %s from %s where %s = '%s'"""%(identify,table,identify,field)	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)	search=self.ZSQLSimpleSearch(searchStr)
if search:	if search:
update=True	update=True
Line 366 class ZSQLExtendFolder(Folder,Persistent	Line 366 class ZSQLExtendFolder(Folder,Persistent
field=dataSet[nr]	field=dataSet[nr]

queryStr="""UPDATE %s SET %s WHERE %s = '%s' """%(table,setStr,identify,field)	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)	self.ZSQLSimpleSearch(queryStr)
ret+="ud: %s \n"%field	ret+="ud: %s \n"%field
else:	else:
Line 378 class ZSQLExtendFolder(Folder,Persistent	Line 378 class ZSQLExtendFolder(Folder,Persistent

queryStr="""INSERT INTO %s (%s) VALUES (%s)"""%(table,fields,values)	queryStr="""INSERT INTO %s (%s) VALUES (%s)"""%(table,fields,values)
self.ZSQLSimpleSearch(queryStr)	self.ZSQLSimpleSearch(queryStr)
logging.LOG("update xml",logging.INFO,queryStr)	logger("update xml",logging.INFO,queryStr)
ret+="ad: %s \n"%field	ret+="ad: %s \n"%field

elif node[1].nodeName=="METADATA":	elif node[1].nodeName=="METADATA":
Line 390 class ZSQLExtendFolder(Folder,Persistent	Line 390 class ZSQLExtendFolder(Folder,Persistent
for name in names:	for name in names:
fieldNames.append(name.getAttribute('NAME'))	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' """	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)]	columns=[x.attname for x in self.ZSQLSimpleSearch(qstr%table)]

for fieldName in fieldNames:	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:	if fieldName not in columns:
qstr="""alter table %s add %s %s"""	qstr="""alter table %s add %s %s"""
self.ZSQLSimpleSearch(qstr%(table,fieldName,'text'))	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")	#fn=node[1].getAttribute("xml:id")
#nf=file("xtf/"+fn+".xtf",'w')	#nf=file("xtf/"+fn+".xtf",'w')
#nf.write("""<texts xmlns="http://emegir.info/xtf" xmlns:lem="http://emegir.info/lemma" >"""+node[1].toxml()+"</texts>")	#nf.write("""<texts xmlns="http://emegir.info/xtf" xmlns:lem="http://emegir.info/lemma" >"""+node[1].toxml()+"</texts>")
Line 424 class ZSQLExtendFolder(Folder,Persistent	Line 424 class ZSQLExtendFolder(Folder,Persistent

if data:	if data:
data=bz2.decompress(base64.decodestring(data))	data=bz2.decompress(base64.decodestring(data))
zLOG.LOG("fmpxml",zLOG.INFO,"received file")	logger("fmpxml",logging.INFO,"received file")
doc=parseString(data)	doc=parseString(data)
zLOG.LOG("fmpxml",zLOG.INFO,"parsed file")	logger("fmpxml",logging.INFO,"parsed file")

elif filename:	elif filename:
fh=file(filename)	fh=file(filename)
zLOG.LOG("fmpxml",zLOG.INFO,"reading file")	logger("fmpxml",logging.INFO,"reading file")
doc=parse(fh)	doc=parse(fh)
zLOG.LOG("fmpxml",zLOG.INFO,"parsed file")	logger("fmpxml",logging.INFO,"parsed file")

dbIDs = {}	dbIDs = {}
rowcnt = 0	rowcnt = 0
Line 445 class ZSQLExtendFolder(Folder,Persistent	Line 445 class ZSQLExtendFolder(Folder,Persistent
dbIDs[id[0]] = 0;	dbIDs[id[0]] = 0;
rowcnt += 1	rowcnt += 1

zLOG.LOG("fmpxml",zLOG.INFO,"%d entries in DB to sync"%rowcnt)	logger("fmpxml",logging.INFO,"%d entries in DB to sync"%rowcnt)

fieldNames = []	fieldNames = []
rowcnt = 0	rowcnt = 0
Line 471 class ZSQLExtendFolder(Folder,Persistent	Line 471 class ZSQLExtendFolder(Folder,Persistent
# update all fields	# update all fields
update_fields = fieldNames	update_fields = fieldNames

zLOG.LOG("fmpxml fieldnames:",zLOG.INFO,repr(fieldNames))	logger("fmpxml fieldnames:",logging.INFO,repr(fieldNames))
# get list of fields in db table	# get list of fields in db table
qstr="""select attname from pg_attribute, pg_class where attrelid = pg_class.oid and relname = '%s'"""	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)]	columns=[x.attname for x in self.ZSQLSimpleSearch(qstr%table)]

# adjust db table to fields in XML and fieldlist	# adjust db table to fields in XML and fieldlist
for fieldName in fieldNames:	for fieldName in fieldNames:
zLOG.LOG("fmpxml fieldname:",zLOG.INFO,repr(fieldName))	logger("fmpxml fieldname:",logging.INFO,repr(fieldName))
if (fieldName not in columns) and (fieldName in update_fields):	if (fieldName not in columns) and (fieldName in update_fields):
qstr="""alter table %s add %s %s"""	qstr="""alter table %s add %s %s"""
self.ZSQLSimpleSearch(qstr%(table,fieldName,'text'))	self.ZSQLSimpleSearch(qstr%(table,fieldName,'text'))
zLOG.LOG("fmpxml add field:",zLOG.INFO,qstr%(table,fieldName,'text'))	logger("fmpxml add field:",logging.INFO,qstr%(table,fieldName,'text'))

# ROW tags (in RESULTSET tag) hold data	# ROW tags (in RESULTSET tag) hold data
elif node[1].nodeName == 'ROW':	elif node[1].nodeName == 'ROW':
Line 515 class ZSQLExtendFolder(Folder,Persistent	Line 515 class ZSQLExtendFolder(Folder,Persistent
setStr=string.join(setvals, ',')	setStr=string.join(setvals, ',')
id_val=dataSet[id_field]	id_val=dataSet[id_field]
qstr="""UPDATE %s SET %s WHERE %s = '%s' """%(table,setStr,id_field,id_val)	qstr="""UPDATE %s SET %s WHERE %s = '%s' """%(table,setStr,id_field,id_val)
#zLOG.LOG("fmpxml update:",zLOG.INFO,queryStr)	#logger("fmpxml update:",logging.INFO,queryStr)
self.ZSQLSimpleSearch(qstr)	self.ZSQLSimpleSearch(qstr)
ret+="up: %s \n"%id_val	ret+="up: %s \n"%id_val
else:	else:
Line 524 class ZSQLExtendFolder(Folder,Persistent	Line 524 class ZSQLExtendFolder(Folder,Persistent
values=string.join([" %s "%self.ZSQLQuote(dataSet[x]) for x in update_fields], ',')	values=string.join([" %s "%self.ZSQLQuote(dataSet[x]) for x in update_fields], ',')
qstr="""INSERT INTO %s (%s) VALUES (%s)"""%(table,fields,values)	qstr="""INSERT INTO %s (%s) VALUES (%s)"""%(table,fields,values)
self.ZSQLSimpleSearch(qstr)	self.ZSQLSimpleSearch(qstr)
#zLOG.LOG("fmpxml: insert",zLOG.INFO,queryStr)	#logger("fmpxml: insert",logging.INFO,queryStr)
ret+="ad: %s \n"%dataSet.get(id_field, rowcnt)	ret+="ad: %s \n"%dataSet.get(id_field, rowcnt)

#zLOG.LOG("fmpxml row:",zLOG.INFO,"%d (%s)"%(rowcnt,id_val))	#logger("fmpxml row:",logging.INFO,"%d (%s)"%(rowcnt,id_val))
if (rowcnt % 10) == 0:	if (rowcnt % 10) == 0:
zLOG.LOG("fmpxml row:",zLOG.INFO,"%d (%s)"%(rowcnt,id_val))	logger("fmpxml row:",logging.INFO,"%d (%s)"%(rowcnt,id_val))
transaction.commit()	transaction.commit()

transaction.commit()	transaction.commit()
Line 538 class ZSQLExtendFolder(Folder,Persistent	Line 538 class ZSQLExtendFolder(Folder,Persistent
for id in dbIDs.keys():	for id in dbIDs.keys():
# find all not-updated fields	# find all not-updated fields
if dbIDs[id] == 0:	if dbIDs[id] == 0:
zLOG.LOG("fmpxml delete:",zLOG.INFO,id)	logger("fmpxml delete:",logging.INFO,id)
qstr = "DELETE FROM %s WHERE %s = '%s'"	qstr = "DELETE FROM %s WHERE %s = '%s'"
self.ZSQLSimpleSearch(qstr%(table,id_field,id))	self.ZSQLSimpleSearch(qstr%(table,id_field,id))

elif dbIDs[id] > 1:	elif dbIDs[id] > 1:
zLOG.LOG("fmpxml sync:",zLOG.INFO,"id used more than once?"+id)	logger("fmpxml sync:",logging.INFO,"id used more than once?"+id)

transaction.commit()	transaction.commit()

Line 717 class ZSQLExtendFolder(Folder,Persistent	Line 717 class ZSQLExtendFolder(Folder,Persistent
#print "field",field	#print "field",field
if not field:	if not field:
return 1	return 1
if field=="":	if field.strip()=="":
return 1	return 1
return 0	return 0

Line 818 class ZSQLExtendFolder(Folder,Persistent	Line 818 class ZSQLExtendFolder(Folder,Persistent
for result in results:	for result in results:
field=getattr(result,fieldName)	field=getattr(result,fieldName)
fieldValue=getattr(result,valueName)	fieldValue=getattr(result,valueName)

if fieldValue:	if fieldValue:

if not linelen:	if not linelen:
Line 927 class ZSQLExtendFolder(Folder,Persistent	Line 928 class ZSQLExtendFolder(Folder,Persistent
try:	try:
self.getConnectionObj().manage_close_connection()	self.getConnectionObj().manage_close_connection()
except:	except:
logging.LOG("ZSQLResetConnection",logging.ERROR, '%s %s'%sys.exc_info()[:2])	logger("ZSQLResetConnection",logging.ERROR, '%s %s'%sys.exc_info()[:2])
try:	try:
self.getConnectionObj().manage_open_connection()	self.getConnectionObj().manage_open_connection()
except:	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):	def ZSQLSimpleSearch(self,query=None,max_rows=1000000):
"""simple search"""	"""simple search"""
Line 954 class ZSQLExtendFolder(Folder,Persistent	Line 955 class ZSQLExtendFolder(Folder,Persistent
try:	try:
self.getConnectionObj().manage_open_connection()	self.getConnectionObj().manage_open_connection()
except:	except:
logging.LOG("ZSQLSimpleSearch",logging.ERROR, '%s %s'%sys.exc_info()[:2])	logger("ZSQLSimpleSearch",logging.ERROR, '%s %s'%sys.exc_info()[:2])
else:	else:
try:	try:

Line 967 class ZSQLExtendFolder(Folder,Persistent	Line 968 class ZSQLExtendFolder(Folder,Persistent
try:	try:
self.getConnectionObj().manage_open_connection()	self.getConnectionObj().manage_open_connection()
except:	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):	def getConnectionObj(self):
if hasattr(self,'connection_id'):	if hasattr(self,'connection_id'):
Line 1055 class ZSQLExtendFolder(Folder,Persistent	Line 1056 class ZSQLExtendFolder(Folder,Persistent
else:	else:
return True	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"""	"""change entries"""
#qs=self.REQUEST['QUERY_STRING']	#qs=self.REQUEST['QUERY_STRING']
# very bad hack	# very bad hack
Line 1067 class ZSQLExtendFolder(Folder,Persistent	Line 1068 class ZSQLExtendFolder(Folder,Persistent
qs_temp.append(a+"="+urllib.quote(str(self.REQUEST.form[a])))	qs_temp.append(a+"="+urllib.quote(str(self.REQUEST.form[a])))


	if args:
	arg_tmp=args
	else:
	arg_tmp=argv

for field in argv.keys():	for field in arg_tmp.keys():

if field[0]=="_":	if field[0]=="_":
fieldTmp="-"+field[1:]	fieldTmp="-"+field[1:]
else:	else:
fieldTmp=field	fieldTmp=field

qs_temp.append("%s=%s"%(fieldTmp,argv[field]))	qs_temp.append("%s=%s"%(fieldTmp,arg_tmp[field]))


changeList=[]	changeList=[]
	logging.info("ZSQLChange qs_temp: %s"%repr(qs_temp))
for q in qs_temp:	for q in qs_temp:

name=urllib.unquote(re.sub("r'+'"," ",q.split("=")[0].lower()))	name=urllib.unquote(re.sub("r'+'"," ",q.split("=")[0].lower()))
Line 1105 class ZSQLExtendFolder(Folder,Persistent	Line 1110 class ZSQLExtendFolder(Folder,Persistent
changeString=string.join(changeList,",")	changeString=string.join(changeList,",")

queryString="UPDATE %s SET %s WHERE %s"%(table,changeString,identify)	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)	self.ZSQLSimpleSearch(queryString)

Line 1291 class ZSQLExtendFolder(Folder,Persistent	Line 1296 class ZSQLExtendFolder(Folder,Persistent


arg=argTmp[0:]	arg=argTmp[0:]
if arg[0]=="_":arg="-"+argTmp[1:] # aender _ in - als standard

if arg not in queryList: # noch nicht drin	if arg not in queryList: # noch nicht drin
querys.append("%s=%s"%(arg,argv[argTmp]))	querys.append("%s=%s"%(arg,argv[argTmp]))
Line 1340 class ZSQLExtendFolder(Folder,Persistent	Line 1345 class ZSQLExtendFolder(Folder,Persistent
searchFields={}	searchFields={}
searchFieldsOnly={}	searchFieldsOnly={}
queryTemplate=[]	queryTemplate=[]
	outerjoin=""

if not select:	if not select:
select="oid,*"	select="oid,*"
Line 1425 class ZSQLExtendFolder(Folder,Persistent	Line 1431 class ZSQLExtendFolder(Folder,Persistent
skip="OFFSET "+str(value)	skip="OFFSET "+str(value)
rangeStart=str(value)	rangeStart=str(value)
elif name==iCT+"join":	elif name==iCT+"join":

whereList.append(value)	whereList.append(value)
	elif name==iCT+"outerjoin":

	outerjoin=value
elif name==iCT+"sort":	elif name==iCT+"sort":
sortstrs=[]	sortstrs=[]

for word in value.split(','):	for word in value.split(','):
wordstr=word.lstrip().rstrip()	wordstr=word.lstrip().rstrip()
if sortAllFields:	if sortAllFields:
Line 1580 class ZSQLExtendFolder(Folder,Persistent	Line 1591 class ZSQLExtendFolder(Folder,Persistent

#print "QE",table	#print "QE",table
#print (select,table,where,sort,maxstr,skip)	#print (select,table,where,sort,maxstr,skip)
query="SELECT %s FROM %s %s %s %s %s"%(select,table,where,sort,maxstr,skip)	query="SELECT %s FROM %s %s %s %s %s %s"%(select,table,outerjoin,where,sort,maxstr,skip)

if not nostore=="yes":	if not nostore=="yes":

Line 1650 class ZSQLExtendFolder(Folder,Persistent	Line 1661 class ZSQLExtendFolder(Folder,Persistent
def ZSQLQuery(self,query,debug=None):	def ZSQLQuery(self,query,debug=None):
"""query"""	"""query"""
if debug:	if debug:
logging.LOG("ZSQLQuery", logging.INFO, query)	logger("ZSQLQuery", logging.INFO, query)

return self.ZSQLSimpleSearch(query)	return self.ZSQLSimpleSearch(query)

Line 1678 class ZSQLExtendFolder(Folder,Persistent	Line 1689 class ZSQLExtendFolder(Folder,Persistent
self.REQUEST.SESSION['query']=string.join(self.REQUEST['QUERY_STRING'].split("&"),",")	self.REQUEST.SESSION['query']=string.join(self.REQUEST['QUERY_STRING'].split("&"),",")
self.REQUEST.SESSION['come_from_search']="yes"	self.REQUEST.SESSION['come_from_search']="yes"

return self.REQUEST.RESPONSE.redirect(urllib.unquote(formatfile))	return self.REQUEST.RESPONSE.redirect(urllib.unquote(formatfile)+"?"+rq)


def ZSQLint(self,string):	def ZSQLint(self,string):

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.100
changed lines
	Added in v.1.103