ZSQLExtend/ZSQLExtend.py - diff

Return to ZSQLExtend.py CVS log

Up to [Repository] / ZSQLExtend

Diff for /ZSQLExtend/ZSQLExtend.py between versions 1.93 and 1.98

version 1.93, 2006/09/16 16:15:24	version 1.98, 2006/12/08 16:23:54
Line 1	Line 1

from OFS.Folder import Folder	from OFS.Folder import Folder
from Acquisition import Implicit	from Acquisition import Implicit
from Globals import DTMLFile,package_home,Persistent	from Globals import DTMLFile,package_home,Persistent
Line 19 import zLOG	Line 18 import zLOG
import os.path	import os.path
import os	import os
import copy	import copy
	import unicodedata

from OFS.SimpleItem import SimpleItem	from OFS.SimpleItem import SimpleItem

	def getTextFromNode(nodename):
	"""get the cdata content of a node"""
	if nodename is None:
	return ""
	nodelist=nodename.childNodes
	rc = ""
	for node in nodelist:
	if node.nodeType == node.TEXT_NODE:
	rc = rc + node.data
	return rc

def analyseIntSearch(word):	def analyseIntSearch(word):
#analyse integer searches	#analyse integer searches

Line 321 class ZSQLExtendFolder(Folder,Persistent	Line 332 class ZSQLExtendFolder(Folder,Persistent
else:	else:
if node[1].nodeName==containerTagName:	if node[1].nodeName==containerTagName:
doc.expandNode(node[1])	doc.expandNode(node[1])
	cols=node[1].getElementsByTagName('COL')
	dataSet=[]
	for col in cols:
	data=col.getElementsByTagName('DATA')
	dataSet.append(getTextFromNode(data[0]))
	update=False
	if identify:

	nr=fieldNames.index(identify)
	field=dataSet[nr]

	searchStr="""select %s from %s where %s = '%s'"""%(identify,table,identify,field)
	zLOG.LOG("import xml",zLOG.INFO,searchStr)
	search=self.ZSQLSimpleSearch(searchStr)
	if search:
	update=True

	if update:
	tmp=[]
	for fieldName in fieldNames:
	tmp.append("""%s = %s"""%(fieldName,self.ZSQLQuote(dataSet[fieldNames.index(fieldName)])))
	setStr=",".join(tmp)
	nr=fieldNames.index(identify)
	field=dataSet[nr]

	queryStr="""UPDATE %s SET %s WHERE %s = '%s' """%(table,setStr,identify,field)
	zLOG.LOG("update xml",zLOG.INFO,queryStr)
	self.ZSQLSimpleSearch(queryStr)
	ret+="ud: %s \n"%field
	else:


	fields=",".join(fieldNames)
	values=",".join([""" %s """%self.ZSQLQuote(x) for x in dataSet])


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

	elif node[1].nodeName=="METADATA":
	fieldNames=[]
	doc.expandNode(node[1])

	names=node[1].getElementsByTagName('FIELD')

	for name in names:
	fieldNames.append(name.getAttribute('NAME'))

	zLOG.LOG("update xml: fieldnames",zLOG.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:
	zLOG.LOG("update xml: fieldname",zLOG.INFO,repr(fieldName))
	if fieldName not in columns:
	qstr="""alter table %s add %s %s"""
	self.ZSQLSimpleSearch(qstr%(table,fieldName,'text'))
	zLOG.LOG("update xml: fieldname add",zLOG.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 633 class ZSQLExtendFolder(Folder,Persistent	Line 704 class ZSQLExtendFolder(Folder,Persistent

#print "INLINE:",argv	#print "INLINE:",argv
for a in argTmp.keys():	for a in argTmp.keys():
qs.append(a+"="+urllib.quote(str(argTmp[a])))	aFiltered=re.sub(r"^-","_",a) # beginning of a command should always be "_"
	qs.append(aFiltered+"="+urllib.quote(str(argTmp[a])))
#return []	#return []
ret = self.parseQueryString(string.join(qs,","),"_",storename=storename)	ret = self.parseQueryString(string.join(qs,","),"_",storename=storename)

Line 681 class ZSQLExtendFolder(Folder,Persistent	Line 753 class ZSQLExtendFolder(Folder,Persistent

#print "INLINE:",argv	#print "INLINE:",argv
for a in argTmp.keys():	for a in argTmp.keys():
try:	aFiltered=re.sub(r"^-","_",a) # beginning of a command should always be "_"
qs.append(a+"="+urllib.quote(str(argTmp[a])))	qs.append(aFiltered+"="+urllib.quote(str(argTmp[a])))
except:
import urllib
qs.append(a+"="+urllib.quote(str(argTmp[a])))

#return []	#return []

Line 713 class ZSQLExtendFolder(Folder,Persistent	Line 783 class ZSQLExtendFolder(Folder,Persistent
def ZSQLSimpleSearch(self,query=None,max_rows=1000000):	def ZSQLSimpleSearch(self,query=None,max_rows=1000000):
"""simple search"""	"""simple search"""

	#print query
if not query:	if not query:
query=self.query	query=self.query

Line 874 class ZSQLExtendFolder(Folder,Persistent	Line 944 class ZSQLExtendFolder(Folder,Persistent
#elif (not (name[0]=="-" or name[0]=="_")) and (not len(value)==0):	#elif (not (name[0]=="-" or name[0]=="_")) and (not len(value)==0):
elif (not (name[0]=="-" or name[0]=="_")):	elif (not (name[0]=="-" or name[0]=="_")):

	if value=="":
	changeList.append("\""+name+"\"=null")
	else:
changeList.append("\""+name+"\"="+sql_quote(urllib.unquote(value)))	changeList.append("\""+name+"\"="+sql_quote(urllib.unquote(value)))

changeString=string.join(changeList,",")	changeString=string.join(changeList,",")
Line 1040 class ZSQLExtendFolder(Folder,Persistent	Line 1113 class ZSQLExtendFolder(Folder,Persistent

def ZSQLNewSearch(self,linkText,storename=None,url=None,args=None,**argv):	def ZSQLNewSearch(self,linkText,storename=None,url=None,args=None,**argv):
"""suche mit alten parametern bis auf die in argv getauschten"""	"""suche mit alten parametern bis auf die in argv getauschten"""
	str = self.ZSQLNewSearchURL(storename, url, args, **argv)
	return """<a href="%s"> %s</a>"""%(str,linkText)


	def ZSQLNewSearchURL(self, storename=None,url=None,args=None,**argv):
	"""suche mit alten parametern bis auf die in argv getauschten"""

if storename:	if storename:
"""store"""	"""store"""
Line 1083 class ZSQLExtendFolder(Folder,Persistent	Line 1162 class ZSQLExtendFolder(Folder,Persistent
else:	else:
str="ZSQLSearch?"+"&".join(newquery)	str="ZSQLSearch?"+"&".join(newquery)

return """<a href="%s"> %s</a>"""%(str,linkText)	return str

def parseQueryString(self,qs,iCT,storemax="no",select=None,nostore=None,storename=None,tableExt=None,NoQuery=None,NoLimit=None,restrictField=None,restrictConnect=None,filter=None):	def parseQueryString(self,qs,iCT,storemax="no",select=None,nostore=None,storename=None,tableExt=None,NoQuery=None,NoLimit=None,restrictField=None,restrictConnect=None,filter=None):
"""analysieren den QueryString"""	"""analysieren den QueryString"""
Line 1100 class ZSQLExtendFolder(Folder,Persistent	Line 1179 class ZSQLExtendFolder(Folder,Persistent
opfields={}	opfields={}
lopfields={} #Verknuepfung bei mehrfachauswahl von einem feld	lopfields={} #Verknuepfung bei mehrfachauswahl von einem feld
sortfields={} #order of sortfields	sortfields={} #order of sortfields
	diacritics={} #diacritische zeichen, falls "no", dann werden diese fuer das feld gefiltert.
sortAllFields=None	sortAllFields=None
skip=""	skip=""
rangeStart=0	rangeStart=0
Line 1142 class ZSQLExtendFolder(Folder,Persistent	Line 1222 class ZSQLExtendFolder(Folder,Persistent
field=name[5:]	field=name[5:]
lopfields[field]=lop	lopfields[field]=lop

	if name[0:11]==iCT+"diacritics":
	field=name[12:]
	diacritics[field]=value

if name[0:10]==iCT+"sortorder":	if name[0:10]==iCT+"sortorder":
#sort=value	#sort=value

Line 1167 class ZSQLExtendFolder(Folder,Persistent	Line 1251 class ZSQLExtendFolder(Folder,Persistent
punktsplit=name.split(".") #sonderfall feld mit punkten(tabelle.suchFeld.ausgewaehltesFeld,feldinoriginal), d.h. suche in anderer tabelle:	punktsplit=name.split(".") #sonderfall feld mit punkten(tabelle.suchFeld.ausgewaehltesFeld,feldinoriginal), d.h. suche in anderer tabelle:

#analysiere alle anderen faelle	#analysiere alle anderen faelle

	if diacritics.get(name,'yes')=='no':
	"""filter diacritische zeichen"""
	value=unicodedata.normalize('NFKD', value.decode('utf-8')).encode('ASCII', 'ignore')

if name==iCT+"lop":	if name==iCT+"lop":
lop=value	lop=value
elif name==iCT+"table":	elif name==iCT+"table":
Line 1207 class ZSQLExtendFolder(Folder,Persistent	Line 1296 class ZSQLExtendFolder(Folder,Persistent
op=value	op=value


	#sonderfall Name hat das Format:
	#TABELLE.SUCHFELD_IN_DIESER_TABELLE.SELECT_FIELD.IDENTIFIER_IN_TABELLE_-table
	#i.e. erzeugt wird
	#das Statement
	#WHERE IDENTIFIER_IN_TABELLE in (select * from SELECT_FIELD
	#where LOWER(SUCHFELD_IN_DIESER_TABELLE) something value)
	#something is defined by _op_TABELLE.SUCHFELD_IN_DIESER_TABELLE.SELECT_FIELD.IDENTIFIER_IN_TABELLE

elif (not name[0]==iCT) and len(punktsplit)==4:	elif (not name[0]==iCT) and len(punktsplit)==4:
if opfields.has_key(name):	if opfields.has_key(name):
Line 1215 class ZSQLExtendFolder(Folder,Persistent	Line 1311 class ZSQLExtendFolder(Folder,Persistent
op="ct"	op="ct"
namealt=name	namealt=name
name="LOWER("+punktsplit[1]+")"	name="LOWER("+punktsplit[1]+")"
	value=value.lower()
if op=="ct":	if op=="ct":
tmp=(name+" LIKE "+sql_quote("%"+value+"%"))	tmp=(name+" LIKE "+sql_quote("%"+value+"%"))
elif op=="gt":	elif op=="gt":

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

Removed from v.1.93
changed lines
	Added in v.1.98