ZSQLExtend/ZSQLExtend.py - diff

Return to ZSQLExtend.py CVS log

Up to [Repository] / ZSQLExtend

Diff for /ZSQLExtend/ZSQLExtend.py between versions 1.43 and 1.73

version 1.43, 2004/10/21 15:58:29	version 1.73, 2005/11/23 14:15:11
Line 1	Line 1
from OFS.Folder import Folder	from OFS.Folder import Folder
from Globals import Persistent
from Acquisition import Implicit	from Acquisition import Implicit
from Globals import DTMLFile	from Globals import DTMLFile,package_home,Persistent
import urllib	import urllib
import re	import re
import string	import string
	import sys
#from pyPgSQL import libpq	#from pyPgSQL import libpq
from AccessControl import getSecurityManager	from AccessControl import getSecurityManager
import os.path	from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate
from Products.PageTemplates.PageTemplateFile import PageTemplateFile	from Products.PageTemplates.PageTemplateFile import PageTemplateFile

from Products.ZSQLMethods.SQL import SQLConnectionIDs	from Products.ZSQLMethods.SQL import SQLConnectionIDs
	from xml.sax.saxutils import escape
	from types import *
import Shared.DC.ZRDB.DA	import Shared.DC.ZRDB.DA
	import zLOG
	import os.path
	import os
	from OFS.SimpleItem import SimpleItem

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

splitted=word.split("-")	splitted=word.split("-")

	if len(splitted)==1:
	return "="+splitted[0]

if splitted[0]=="":	if splitted[0]=="":
return "< "+splitted[1]	return "< "+splitted[1]

Line 33 def sql_quote(v):	Line 42 def sql_quote(v):
quote_dict = {"\'": "''", "\\": "\\\\"}	quote_dict = {"\'": "''", "\\": "\\\\"}
for dkey in quote_dict.keys():	for dkey in quote_dict.keys():
if string.find(v, dkey) >= 0:	if string.find(v, dkey) >= 0:
v=join(split(v,dkey),quote_dict[dkey])	v=string.join(string.split(v,dkey),quote_dict[dkey])
return "'%s'" % v	return "'%s'" % v

def showSQLConnectionIDs(self):	def showSQLConnectionIDs(self):
return SQLConnectionIDs(self)	return SQLConnectionIDs(self)

	class ZSQLIndex(SimpleItem):
	"""index"""
	meta_type="ZSQLIndex"

	def __init__(self,index,id,table=''):
	self.index=[x for x in index]
	self.id=id
	self.table=table

	def setIndex(self,index):
	self.index=[x for x in index]

	def getIndex(self):
	return self.index

class ZSQLExtendFolder(Folder,Persistent, Implicit):	class ZSQLExtendFolder(Folder,Persistent, Implicit):
"""Folder"""	"""Folder"""
meta_type="ZSQLExtendFolder"	meta_type="ZSQLExtendFolder"

	def importXMLFile(self,table,containerTagName,file,identify=None,RESPONSE=None):
	#TODO: finish importXMLFile
	'''
	Import XML file into the table
	@param table: name of the table the xml shall be imported into
	@param containerTagName: XML-Tag which describes a dataset
	@param file: xmlfile handle
	@param identify: (optional) field res. tag which identifies a entry uniquely for updating purposes.
	@param RESPONSE: (optional)
	'''
	from xml.dom.pulldom import parseString

	doc=parseString(file.read())
	while 1:
	node=doc.getEvent()

	if node is None:
	break;
	else:
	if node[1].nodeName==containerTagName:
	doc.expandNode(node[1])
	#fn=node[1].getAttribute("xml:id")
	#nf=file("xtf/"+fn+".xtf",'w')
	#nf.write("""<texts xmlns="http://emegir.info/xtf" xmlns:lem="http://emegir.info/lemma" >"""+node[1].toxml()+"</texts>")
	#print "wrote: %s"%fn


	def generateIndex(self,field,index_name,table,RESPONSE=None):
	"""erzeuge index aus feld"""
	index={}
	founds=self.ZSQLSimpleSearch("""SELECT %s,oid FROM %s LIMIT 2000"""%(field,table))

	for found in founds:
	tmp=getattr(found,field,None)
	if tmp:
	strings=tmp.split(" ")
	for string in strings:
	if index.get(string):
	index[string].append(found.oid)
	else:
	index[string]=[found.oid]
	RESPONSE.write(string+"\n")

	if not hasattr(self,index_name):
	obj=ZSQLIndex(index,index_name,table)
	self._setObject(index_name,obj)

	self._getOb(index_name).setIndex(index)

	def getIndex(self,index_name):
	"""getIndex"""
	founds=self.ZopeFind(self,obj_ids=[index_name])

	return founds[0][1].getIndex()


def testneu(self):	def testneu(self):
"""test"""	"""test"""
relStatement="""period like '%s%%'"""	relStatement="""period like '%s%%'"""
Line 51 class ZSQLExtendFolder(Folder,Persistent	Line 131 class ZSQLExtendFolder(Folder,Persistent
classes=['Uruk III','Uruk IV']	classes=['Uruk III','Uruk IV']
return self.searchRel(relStatement,statement,wherePart,classes)	return self.searchRel(relStatement,statement,wherePart,classes)

	def URLquote(self,txt):
	"""urlquote"""
	return urllib.quote(txt)

def searchRel(self,relStatement,statement,wherePart,classes):	def searchRel(self,relStatement,statement,wherePart,classes):
"""suche relative haufigkeiten"""	"""suche relative haufigkeiten"""
ret={}	ret={}
Line 68 class ZSQLExtendFolder(Folder,Persistent	Line 152 class ZSQLExtendFolder(Folder,Persistent
obj=getattr(self,"ZSQLBibliography_template")	obj=getattr(self,"ZSQLBibliography_template")
return obj()	return obj()
except:	except:
pt=PageTemplateFile('Products/ZSQLExtend/zpt/ZSQLBibliography_template_standard.zpt',content_type='text/htm').__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ZSQLBibliography_template_standard.zpt'),content_type='text/html').__of__(self)
pt.content_type="text/html"	pt.content_type="text/html"

return pt()	return pt()
Line 101 class ZSQLExtendFolder(Folder,Persistent	Line 185 class ZSQLExtendFolder(Folder,Persistent

def changeZSQLExtendForm(self):	def changeZSQLExtendForm(self):
"""change folder config"""	"""change folder config"""
pt=PageTemplateFile('Products/ZSQLExtend/zpt/changeZSQLExtendForm.zpt').__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changeZSQLExtendForm.zpt')).__of__(self)
return pt()	return pt()


Line 118 class ZSQLExtendFolder(Folder,Persistent	Line 202 class ZSQLExtendFolder(Folder,Persistent
def formatAscii(self,str,url=None):	def formatAscii(self,str,url=None):
"""ersetze ascii umbrueche durch <br>"""	"""ersetze ascii umbrueche durch <br>"""
#url=None	#url=None
	str=str.rstrip().lstrip()

if url and str:	if url and str:

retStr=""	retStr=""
Line 192 class ZSQLExtendFolder(Folder,Persistent	Line 278 class ZSQLExtendFolder(Folder,Persistent
return ret	return ret

def ZSQLSelectionFromCRList(self,fieldname,listField,boxType="checkbox",checked=None):	def ZSQLSelectionFromCRList(self,fieldname,listField,boxType="checkbox",checked=None):
"""generate select oprions form a cr seperated list"""	"""generate select options from a cr seperated list"""
fields=listField.split("\n")	fields=listField.split("\n")
ret=""	ret=""
for field in fields:	for field in fields:
Line 202 class ZSQLExtendFolder(Folder,Persistent	Line 288 class ZSQLExtendFolder(Folder,Persistent
ret+="""<input name="%s" type="%s" value="%s">%s"""%(fieldname,boxType,field.encode('utf-8'),field.encode('utf-8'))	ret+="""<input name="%s" type="%s" value="%s">%s"""%(fieldname,boxType,field.encode('utf-8'),field.encode('utf-8'))
return ret	return ret

	def ZSQLSelectionFromSearchList(self,fieldname,results,fieldnameResult,boxType="checkbox",checked=None):
	"""generate select options from a cr seperated list"""

	ret=""
	if not results: return ""

	for result in results:
	field=getattr(result,fieldnameResult)
	if field:
	if checked and (getattr(result,fieldnameResult) in checked.split("\n")):
	ret+="""<input name="%s" type="%s" value="%s" checked>%s"""%(fieldname,boxType,field.encode('utf-8'),field.encode('utf-8'))
	else:
	ret+="""<input name="%s" type="%s" value="%s">%s"""%(fieldname,boxType,field.encode('utf-8'),field.encode('utf-8'))
	return ret


def ZSQLOptionsFromCRList(self,fieldname,listField, multiple=''):	def ZSQLOptionsFromCRList(self,fieldname,listField, multiple='',start=None,startValue=None,size=None,selected=None):
"""generate select oprions form a cr seperated list"""	"""generate select oprions form a cr seperated list"""
fields=listField.split("\n")	fields=listField.split("\n")
	if size:
	ret="""<select name="%s" %s size="%s" >
	"""%(fieldname,multiple,size)

	else:
ret="""<select name="%s" %s>	ret="""<select name="%s" %s>
"""%(fieldname,multiple)	"""%(fieldname,multiple)
	if start:
	if start==' ':
	start=''
	if not startValue:
	startValue=start

	ret+="""<option value="%s" >%s</option>"""%(startValue,start)
for field in fields:	for field in fields:
	if selected and (field in selected.split("\n")):
	ret+="""<option selected value="%s">%s</option>"""%(field.encode('utf-8'),field.encode('utf-8'))
	else:
ret+="""<option value="%s">%s</option>"""%(field.encode('utf-8'),field.encode('utf-8'))	ret+="""<option value="%s">%s</option>"""%(field.encode('utf-8'),field.encode('utf-8'))
ret+="""</select>"""	ret+="""</select>"""
return ret	return ret

def ZSQLOptionsFromSearchList(self,fieldname,results,fieldName,valueName=None,start=None, multiple='',startValue=None):	def ZSQLOptionsFromSearchList(self,fieldname,results,fieldName,valueName=None,start=None, multiple='',startValue=None,additionalSelect="",size=None,linelen=None):
"""generate select oprions form a search list seperated list"""	"""generate select options form a search list
	es wird
	<select name=fieldname mutiple>
	<option value=startValue>start</option>
	<option value=result.fieldName>result.fieldValue</option>
	erzeugt.

	@parameter fieldname: Name fuer name-wert im select-tag
	@results results: Resultobject einer SQL-suche
	@parameter fieldName: Name des Feldes, das als value in den option-tag geschrieben werden soll.
	@parameter valueName: (optional) Name des Feldes, dass als im option-tag ausgegeben wird, default wert ist valueName=fieldName
	@start: (optional) falls zusaetzliches option tag erzeugt werden soll, gibt start an was im option tag steht
	@startValue: gibt den entsprechenden Wert an.
	"""
if not valueName:	if not valueName:
valueName=fieldName	valueName=fieldName
	if size:
ret="""<select name="%s" %s>	ret="""<select name="%s" %s size="%s" %s>
"""%(fieldname,multiple)	"""%(fieldname,multiple,size,additionalSelect)
	else:
	ret="""<select name="%s" %s %s>
	"""%(fieldname,multiple,additionalSelect)
if start:	if start:
if start==' ':	if start==' ':
start=''	start=''
Line 230 class ZSQLExtendFolder(Folder,Persistent	Line 362 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 not linelen:
ret+="""<option value="%s">%s</option>"""%(field,fieldValue)	ret+="""<option value="%s">%s</option>"""%(field,fieldValue)
	else:
	mist = """%s"""%(fieldValue)
	if len(mist) > string.atoi(linelen):
	mist = mist[:string.atoi(linelen)]
	ret+="""<option value="%s">%s</option>"""%(field,mist)
ret+="""</select>"""	ret+="""</select>"""
return ret	return ret

Line 282 class ZSQLExtendFolder(Folder,Persistent	Line 421 class ZSQLExtendFolder(Folder,Persistent
"""inlinesearch"""	"""inlinesearch"""
qs=[]	qs=[]



#print "INLINE:",query	#print "INLINE:",query
return self.ZSQLSimpleSearch(query)	return self.ZSQLSimpleSearch(query)


def ZSQLSimpleSearch(self,query=None):	def ZSQLSimpleSearch(self,query=None,max_rows=1000000):
	"""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.getConnectionObj().getId(),"var","<dtml-var var>")

	self._v_searchSQL.max_rows_=max_rows
	try:

	return self._v_searchSQL.__call__(var=query)
	except :
	if sys.exc_info()[0]=="Database Error":
	try:
	self.getConnectionObj().manage_open_connection()
	except:
	zLOG.LOG("ZSQLSimpleSearch",zLOG.ERROR, '%s %s'%sys.exc_info()[:2])
	else:
	try:
	self._v_searchSQL.max_rows_=max_rows

	return self._v_searchSQL.__call__(var=query)
	except :
	if sys.exc_info()[0]=="Database Error":
	try:
	self.getConnectionObj().manage_open_connection()
	except:
	zLOG.LOG("ZSQLSimpleSearch",zLOG.ERROR, '%s %s'%sys.exc_info()[:2])

	def getConnectionObj(self):
	if hasattr(self,'connection_id'):
	return getattr(self,self.connection_id)


	def ZSQLSimpleSearch2(self,query=None):
""" returrn SQLSearch"""	""" returrn SQLSearch"""
#print "hi",query
if not query:	if not query:
query=self.query	query=self.query
if getattr(self,'_v_search',None):	if getattr(self,'_v_search',None):
Line 314 class ZSQLExtendFolder(Folder,Persistent	Line 488 class ZSQLExtendFolder(Folder,Persistent



def ZSQLAdd(self):	def ZSQLAdd(self,format=None,RESPONSE=None,**argv):
"""Neuer Eintrag"""	"""Neuer Eintrag"""
qs=self.REQUEST['QUERY_STRING']
	qs_temp=[]

	for a in self.REQUEST.form.keys():
	qs_temp.append(a+"="+urllib.quote(str(self.REQUEST.form[a])))

	qs=string.join(qs_temp,",")

	for field in argv.keys():
	if field[0]=="_":
	fieldTmp="-"+field[1:]
	else:
	fieldTmp=field

	qs+=",%s=%s"%(fieldTmp,argv[field])


addList={}	addList={}
for q in qs.split("&"):	for q in qs.split(","):
name=re.sub("r'+'"," ",q.split("=")[0].lower())	name=re.sub("r'+'"," ",q.split("=")[0].lower())
value=q.split("=")[1]	value=q.split("=")[1]
value=re.sub(r'\+'," ",value)	value=re.sub(r'\+'," ",value)
Line 327 class ZSQLExtendFolder(Folder,Persistent	Line 517 class ZSQLExtendFolder(Folder,Persistent
table=urllib.unquote(value)	table=urllib.unquote(value)
elif name=="-format":	elif name=="-format":
format=urllib.unquote(value)	format=urllib.unquote(value)
elif (not name[0]=="-") and (not len(value)==0):	elif (not (name[0]=="-" or name[0]=="_")) and (not len(value)==0):
addList[urllib.unquote(name)]=urllib.unquote(value)	addList[urllib.unquote(name)]=urllib.unquote(value)

keyList=[]	keyList=[]
Line 340 class ZSQLExtendFolder(Folder,Persistent	Line 530 class ZSQLExtendFolder(Folder,Persistent
valueString=string.join(valueList,",")	valueString=string.join(valueList,",")

queryString="INSERT INTO %s (%s) VALUES (%s)"%(table,keyString,valueString)	queryString="INSERT INTO %s (%s) VALUES (%s)"%(table,keyString,valueString)

self.ZSQLSimpleSearch(queryString)	self.ZSQLSimpleSearch(queryString)
return self.REQUEST.RESPONSE.redirect(format)

def ZSQLChange(self,**argv):	if RESPONSE and format:
	return RESPONSE.redirect(format)
	else:
	return True

	def ZSQLChange(self,format=None,RESPONSE=None,USE_FORM=None,**argv):
"""change entries"""	"""change entries"""
#qs=self.REQUEST['QUERY_STRING']	#qs=self.REQUEST['QUERY_STRING']
# very bad hack	# very bad hack
qs_temp=[]

	qs_temp=[]
	if USE_FORM or RESPONSE:
for a in self.REQUEST.form.keys():	for a in self.REQUEST.form.keys():
qs_temp.append(a+"="+urllib.quote(str(self.REQUEST.form[a])))	qs_temp.append(a+"="+urllib.quote(str(self.REQUEST.form[a])))

qs=string.join(qs_temp,"&")


#print "CHANGE QS",self.REQUEST	for field in argv.keys():
#return self.REQUEST
changeList=[]	if field[0]=="_":
for q in qs.split("&"):	fieldTmp="-"+field[1:]
name=urllib.unquote(re.sub("r'+'"," ",q.split("=")[0].lower()))	else:
value=q.split("=")[1]	fieldTmp=field
value=re.sub(r'\+'," ",value)
value=urllib.unquote(value)	qs_temp.append("%s=%s"%(fieldTmp,argv[field]))
if name=="-table":
table=urllib.unquote(value)
elif name=="-identify":
identify=urllib.unquote(value)
identify=identify.split("=")[0]+"="+sql_quote(identify.split("=")[1])
elif name=="-format":
format=urllib.unquote(value)
elif (not name[0]=="-") and (not len(value)==0):
changeList.append("\""+name+"\"="+sql_quote(urllib.unquote(value)))
changeString=string.join(changeList,",")
queryString="UPDATE %s SET %s WHERE %s"%(table,changeString,identify)
self.ZSQLSimpleSearch(queryString)
return self.REQUEST.RESPONSE.redirect(format)

def ZSQLChange_old(self):
"""change entries"""
qs=self.REQUEST['QUERY_STRING']
#print "CHANGE QS",self.REQUEST
#return self.REQUEST
changeList=[]	changeList=[]
for q in qs.split("&"):
	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()))
value=q.split("=")[1]	value="=".join(q.split("=")[1:])
value=re.sub(r'\+'," ",value)	value=re.sub(r'\+'," ",value)
value=urllib.unquote(value)	value=urllib.unquote(value)

if name=="-table":	if name=="-table":
table=urllib.unquote(value)	table=urllib.unquote(value)
elif name=="-identify":	elif name=="-identify":
Line 395 class ZSQLExtendFolder(Folder,Persistent	Line 576 class ZSQLExtendFolder(Folder,Persistent
identify=identify.split("=")[0]+"="+sql_quote(identify.split("=")[1])	identify=identify.split("=")[0]+"="+sql_quote(identify.split("=")[1])
elif name=="-format":	elif name=="-format":
format=urllib.unquote(value)	format=urllib.unquote(value)
elif (not name[0]=="-") and (not len(value)==0):	elif (not (name[0]=="-" or name[0]=="_")) and (not len(value)==0):
changeList.append("\""+name+"\"="+sql_quote(urllib.unquote(value)))	changeList.append("\""+name+"\"="+sql_quote(urllib.unquote(value)))

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)

self.ZSQLSimpleSearch(queryString)	self.ZSQLSimpleSearch(queryString)
return self.REQUEST.RESPONSE.redirect(format)


	if RESPONSE and format:
	return RESPONSE.redirect(format)
	else:
	return True


def ZSQLFind2(self,qs="",select="oid,",storename=None,tableList=['cdli_translit','cdli_cat'],*argv):	def ZSQLFindIndexed(self,qs="",select="oid,",storename=None,indexedFields=['data_line'],restrictField='id_text',*argv):
"""find2"""	"""find2"""
#search1= self.ZSQLFind(qs="",select="oid,",storename=None,tableExt='cdli_translit',restrictField='id_text',NoQuery='yes',NoLimit='yes',*argv)

	for index in self.ZopeFind(self,obj_ids=indexedFields):
	txt=argv.get(index[0],None)
	if txt:
	oids=index[1].getIndex()[txt]

	search1= self.ZSQLFind(qs=qs,select=select,storename=storename,tableExt=tableList[1],restrictField=restrictField,NoQuery='yes',NoLimit='yes',**argv)

	search2 = self.ZSQLFind(tableExt=tableList[0],qs=qs,select=select,storename=storename,restrictConnect=(tableList[0]+"."+restrictField,search1),**argv)
	return search2

#search2 = self.ZSQLFind(tableExt='cdli_cat',qs="",select="oid,",storename=None,restrictConnect=('cdli_cat.id_text',search1),*argv)	def ZSQLFind2(self,qs="",select="oid,",storename=None,tableList=['cdli_translit','cdli_cat'],restrictField='id_text',*argv):
	"""find2"""

search1= self.ZSQLFind(qs="",select="oid,",storename=None,tableExt='cdli_cat',restrictField='id_text',NoQuery='yes',NoLimit='yes',*argv)	search1= self.ZSQLFind(qs=qs,select=select,storename=storename,tableExt=tableList[1],restrictField=restrictField,NoQuery='yes',NoLimit='yes',**argv)

search2 = self.ZSQLFind(tableExt='cdli_translit',qs="",select="oid,",storename=None,restrictConnect=('cdli_translit.id_text',search1),*argv)	search2 = self.ZSQLFind(tableExt=tableList[0],qs=qs,select=select,storename=storename,restrictConnect=(tableList[0]+"."+restrictField,search1),**argv)
return search2	return search2

#return self.ZSQLFind(qs="",select="oid,",storename=None,tableExt=None,NoQuery=None,*argv)

def ZSQLFind(self,qs="",select="oid,",storename=None,tableExt=None,NoQuery=None,NoLimit=None,restrictField=None,restrictConnect=None,filter=None,*argv):	def ZSQLFind(self,qs="",select="oid,",storename=None,tableExt=None,NoQuery=None,NoLimit=None,restrictField=None,restrictConnect=None,filter=None,*argv):
"""Find"""	"""search in database"""

def delEmpty(list):	def delEmpty(list):
	""""loesche leere elemente aus der liste"""
ret=[]	ret=[]
for x in list:	for x in list:
splitted=x.split("=")	splitted=x.split("=")
Line 429 class ZSQLExtendFolder(Folder,Persistent	Line 626 class ZSQLExtendFolder(Folder,Persistent
ret.append(x)	ret.append(x)
return ret	return ret

#self.REQUEST.SESSION['come_from_search']="no" # zuruecksetzen
if qs=="":	if qs=="":
	#kein querystring ubergeben
if self.REQUEST['QUERY_STRING']:	if self.REQUEST['QUERY_STRING']:
qs=self.REQUEST['QUERY_STRING']	qs=self.REQUEST['QUERY_STRING']


qs=string.join(qs.split("&"),",")	qs=string.join(qs.split("&"),",")

for field in argv.keys():	for field in argv.keys():
	if field[0]=="_":
	fieldTmp="-"+field[1:]
	else:
	fieldTmp=field

qs+=",-%s=%s"%(field,argv[field])	qs+=",%s=%s"%(fieldTmp,argv[field])

else:	else:

qs=self.REQUEST.SESSION.get('query','')	qs=self.REQUEST.SESSION.get('query','')

for field in argv.keys():	for field in argv.keys():
#print field	if field[0]=="_":
qs+=",-%s=%s"%(field,argv[field])	fieldTmp="-"+field[1:]
	else:
	fieldTmp=field

	qs+=",%s=%s"%(fieldTmp,argv[field])



else:	else:
self.REQUEST['QUERY_STRING']=qs	self.REQUEST['QUERY_STRING']=qs
Line 457 class ZSQLExtendFolder(Folder,Persistent	Line 662 class ZSQLExtendFolder(Folder,Persistent



qs=re.sub("\\+"," ",qs)# Austauschen da Leerzeichen bei http-get durch + ersetzt wird, generell sollte alles auf post umgeschrieben werden. vom search formular.	qs=re.sub("\\+"," ",qs)#TODO: Austauschen da Leerzeichen bei http-get durch + ersetzt wird, generell sollte alles auf post umgeschrieben werden. vom search formular.

qs=string.join(delEmpty(qs.split(",")),",")	qs=string.join(delEmpty(qs.split(",")),",")

Line 466 class ZSQLExtendFolder(Folder,Persistent	Line 671 class ZSQLExtendFolder(Folder,Persistent
else:	else:
storename="foundCount"	storename="foundCount"

	#store query for further usage
	self.REQUEST.SESSION['query']=qs

#print "calling Query with",repr(NoQuery)	#print "calling Query with",repr(NoQuery)
ret=self.parseQueryString(qs,"-",select=select,storemax="yes",storename=storename,tableExt=tableExt,NoQuery=NoQuery,NoLimit=NoLimit,restrictField=restrictField,restrictConnect=restrictConnect,filter=filter)	ret=self.parseQueryString(qs,"-",select=select,storemax="yes",storename=storename,tableExt=tableExt,NoQuery=NoQuery,NoLimit=NoLimit,restrictField=restrictField,restrictConnect=restrictConnect,filter=filter)
#print self.REQUEST.SESSION["foundCount"]	#print self.REQUEST.SESSION["foundCount"]



return ret	return ret

def ZSQLFoundCountLen(self,var):	def ZSQLFoundCountLen(self,var):
Line 527 class ZSQLExtendFolder(Folder,Persistent	Line 735 class ZSQLExtendFolder(Folder,Persistent

return str(min(int(self.REQUEST.SESSION[storename]['rangeEnd']),int(self.REQUEST.SESSION[storename]['count'])))	return str(min(int(self.REQUEST.SESSION[storename]['rangeEnd']),int(self.REQUEST.SESSION[storename]['count'])))

	def ZSQLNewQuery(self,linkText,storename=None,**argv):
	"""suche neu"""
	return self.ZSQLNewSearch(linkText,storename,url=self.REQUEST['URL'],args=argv)

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

	if storename:
	"""store"""
	else:
	storename="foundCount"
	qs=self.REQUEST.SESSION[storename]['qs']

	if args:
	argv=args

	querys=qs.split(",")
	argList=[]
	arg=""
	queryList=[x.split("=")[0] for x in querys]

	for argTmp in argv.keys():


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

	if arg not in queryList: # noch nicht drin
	querys.append("%s=%s"%(arg,argv[argTmp]))
	argList.append(arg)



	newquery=[]
	for query in querys:
	queryArg=query.split("=")[0]
	qarg=queryArg[0:]
	if qarg[0]=="-":qarg="_"+queryArg[1:] # aender _ in - als standard

	if queryArg in argList:
	newquery.append("%s=%s"%(queryArg,argv[qarg]))
	else:
	newquery.append(query)

	if url:
	str=url+"?"+"&".join(newquery)
	else:
	str="ZSQLSearch?"+"&".join(newquery)

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

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"""
#print "NO",nostore

	#setzte generische werte

lop="AND" # standardsuche mit and	lop="AND" # standardsuche mit and
max="ALL" #standard alle ausw�hlen	max="ALL" #standard alle auswaehlen
maxstr=""	maxstr=""
whereList=[]	whereList=[]
sort=""	sort=""
op="bw"	op="bw"
opfields={}	opfields={}
lopfields={} #Verkn�pfung bei mehrfachauswahl von einem feld	lopfields={} #Verknuepfung bei mehrfachauswahl von einem feld
sortfields={} #order of sortfields	sortfields={} #order of sortfields
sortAllFields=None	sortAllFields=None
skip=""	skip=""
Line 545 class ZSQLExtendFolder(Folder,Persistent	Line 807 class ZSQLExtendFolder(Folder,Persistent
limit=0	limit=0
searchFields={}	searchFields={}
searchFieldsOnly={}	searchFieldsOnly={}
	queryTemplate=[]

if not select:	if not select:
select="oid,*"	select="oid,*"
#print "Q",nostore,qs
#check for op

	#check for op
splitted=qs.split(",")	splitted=qs.split(",")

if tableExt:	if tableExt:
table=tableExt	table=tableExt

if restrictField:	if restrictField:
select=restrictField	select=restrictField


	#erster durchgang suche operatoren
for q in splitted:	for q in splitted:

name=re.sub("r'+'"," ",q.split("=")[0].lower())	name=re.sub("r'+'"," ",q.split("=")[0].lower())
Line 588 class ZSQLExtendFolder(Folder,Persistent	Line 854 class ZSQLExtendFolder(Folder,Persistent
else:	else:
sortfields[field]=value	sortfields[field]=value

#print "HI",op,field	#zweiter durchgang analysiere felder
#print opfieldsa
#now analyse the querystring
for q in qs.split(","):	for q in qs.split(","):


#try:

name=re.sub("r'+'"," ",q.split("=")[0].lower())	name=re.sub("r'+'"," ",q.split("=")[0].lower())
try:	try:
Line 602 class ZSQLExtendFolder(Folder,Persistent	Line 865 class ZSQLExtendFolder(Folder,Persistent
except:	except:
value=""	value=""

#value=sql_quote(value)	punktsplit=name.split(".") #sonderfall feld mit punkten(tabelle.suchFeld.ausgewaehltesFeld,feldinoriginal), d.h. suche in anderer tabelle:


	#analysiere alle anderen faelle
if name==iCT+"lop":	if name==iCT+"lop":
lop=value	lop=value
elif name==iCT+"table":	elif name==iCT+"table":
Line 646 class ZSQLExtendFolder(Folder,Persistent	Line 909 class ZSQLExtendFolder(Folder,Persistent



	elif (not name[0]==iCT) and len(punktsplit)==4:
	if opfields.has_key(name):
	op=opfields[name]
	else:
	op="ct"
	namealt=name
	name="LOWER("+punktsplit[1]+")"

	if op=="ct":
	tmp=(name+" LIKE "+sql_quote("%"+value+"%"))
	elif op=="gt":
	tmp=(name+">"+sql_quote(value))
	elif op=="lt":
	tmp=(name+"<"+sql_quote(value))
	elif op=="eq":
	tmp=(name+"="+sql_quote(value))
	elif op=="bw":
	tmp=(name+" LIKE "+sql_quote(value+"%"))
	elif op=="ew":
	tmp=(name+" LIKE "+sql_quote("%"+value))
	elif op=="all":
	tmps=[]
	for word in value.split(" "):
	tmps.append(name+" LIKE "+sql_quote("%"+word+"%"))

	tmp=string.join(tmps,' AND ')

	elif op=="numerical":
	term=analyseIntSearch(value)
	tmp=(name+" "+term)
	elif op=="grep":
	tmp=(name+" ~* "+sql_quote(value))
	elif op=="one":
	tmps=[]
	for word in value.split(" "):
	tmps.append(name+" LIKE "+sql_quote("%"+word+"%"))

	tmp=string.join(tmps,' OR ')

	op="all"


	searchTmp="""%s in (select %s from %s where %s)"""%(punktsplit[3],punktsplit[2],punktsplit[0],tmp)

	queryTemplate.append(searchTmp)

elif (not name[0]==iCT) and (not len(value)==0):	elif (not name[0]==iCT) and (not len(value)==0):

#print "OP",op,name	#print "OP",op,name
Line 688 class ZSQLExtendFolder(Folder,Persistent	Line 997 class ZSQLExtendFolder(Folder,Persistent

tmp=string.join(tmps,' OR ')	tmp=string.join(tmps,' OR ')

op="ct"	op="all"

if (not tableExt) or (namealt.split('.')[0]==tableExt):	if (not tableExt) or (namealt.split('.')[0]==tableExt):
if searchFields.has_key(name):	if searchFields.has_key(namealt):
searchFields[name]+=lopfields.get(name,'OR')+" "+tmp	searchFields[namealt]+=lopfields.get(name,'OR')+" "+tmp
searchFieldsOnly[name]+=lopfields.get(name,'OR')+" "+value	searchFieldsOnly[namealt]+=lopfields.get(name,'OR')+" "+value
else:	else:
searchFields[name]=tmp	searchFields[namealt]=tmp
searchFieldsOnly[name]=value	searchFieldsOnly[namealt]=value


whereList=["("+searchFields[x]+")" for x in searchFields.keys()]	whereList=["("+searchFields[x]+")" for x in searchFields.keys()]
	whereList+=queryTemplate

if len(whereList)>0:	if len(whereList)>0:
if filter:	if filter:
Line 734 class ZSQLExtendFolder(Folder,Persistent	Line 1045 class ZSQLExtendFolder(Folder,Persistent
#print "QUERYSTRING:",self.REQUEST.SESSION[storename]['queryString2']	#print "QUERYSTRING:",self.REQUEST.SESSION[storename]['queryString2']
if not self.REQUEST.SESSION.has_key(storename):	if not self.REQUEST.SESSION.has_key(storename):
self.REQUEST.SESSION[storename]={}	self.REQUEST.SESSION[storename]={}

	self.REQUEST.SESSION[storename]['qs']=qs #sichere Querystring

if self.REQUEST.SESSION[storename].has_key('queryString2'):	if self.REQUEST.SESSION[storename].has_key('queryString2'):

if not self.REQUEST.SESSION[storename]['queryString2']==query2:	if not self.REQUEST.SESSION[storename]['queryString2']==query2:
#print "HOOOOO",storename	#print "HOOOOO",storename
self.REQUEST.SESSION[storename]['queryString2']=query2	self.REQUEST.SESSION[storename]['queryString2']=query2
	try:
self.REQUEST.SESSION[storename]['count']=self.ZSQLSimpleSearch(query2)[0].count	self.REQUEST.SESSION[storename]['count']=self.ZSQLSimpleSearch(query2)[0].count
	except:
	self.REQUEST.SESSION[storename]['count']=0
#print "QUERY",query2,"::::",self.REQUEST.SESSION[storename]['queryString2']	#print "QUERY",query2,"::::",self.REQUEST.SESSION[storename]['queryString2']

else:	else:

self.REQUEST.SESSION[storename]['queryString2']=query2	self.REQUEST.SESSION[storename]['queryString2']=query2
	if self.ZSQLSimpleSearch(query2):
self.REQUEST.SESSION[storename]['count']=self.ZSQLSimpleSearch(query2)[0].count	self.REQUEST.SESSION[storename]['count']=self.ZSQLSimpleSearch(query2)[0].count
	else:
	self.REQUEST.SESSION[storename]['count']=0
#print "QUERYNEW",self.REQUEST.SESSION[storename]['queryString2']	#print "QUERYNEW",self.REQUEST.SESSION[storename]['queryString2']


Line 766 class ZSQLExtendFolder(Folder,Persistent	Line 1085 class ZSQLExtendFolder(Folder,Persistent

return query	return query

def ZSQLQuery(self,query):	def ZSQLUniqueQuery(self,value,returns):
	"""unique relation"""
	if returns:
	statement="""select %s from %s where %s = '%s' """%(returns[1],returns[0],returns[2],value)
	founds=self.ZSQLSimpleSearch(statement)
	if founds:
	return getattr(founds[0],returns[1])
	else:
	return value
	else:
	return value

	def ZSQLQuery(self,query,debug=None):
"""query"""	"""query"""
#print "hi",query	if debug:
	zLOG.LOG("ZSQLQuery", zLOG.INFO, query)

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


def ZSQLSearch(self):	def ZSQLSearch(self):
"""To be done"""	"""To be done"""
rq=self.REQUEST['QUERY_STRING']
querys=rq.split("&")

	formatfile=self.REQUEST['URL1'] #generisch redirect zur gleichen url

for querytemp in querys:	#zerlege querystring in key value paare
	#TODO: check if this is really necessary, use argv**

	rq=self.REQUEST['QUERY_STRING']
	querys=rq.split("&")
	for querytemp in querys: #zerg
query=querytemp.split("=")	query=querytemp.split("=")

try:	try:
if query[0].lower()=="-format":	if query[0].lower()=="-format":
formatfile=query[1]	formatfile=query[1]
except:	except:
"""nothing"""	pass
#print formatfile

	#sichern
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"

Line 860 class ZSQLExtendFolder(Folder,Persistent	Line 1199 class ZSQLExtendFolder(Folder,Persistent
newquery.append(query)	newquery.append(query)

newquerystring=string.join(newquery,"&")	newquerystring=string.join(newquery,"&")
	return "<a href='%s'>%s</a>"%(self.REQUEST['URL']+"?"+newquerystring,html)

return "<a href='%s'>%s</a>"%(self.actualPath()+"?"+newquerystring,html)


def prevLink(self,html,storename="foundCount"):	def prevLink(self,html,storename="foundCount"):
Line 887 class ZSQLExtendFolder(Folder,Persistent	Line 1226 class ZSQLExtendFolder(Folder,Persistent

if self.REQUEST['QUERY_STRING']=="":	if self.REQUEST['QUERY_STRING']=="":
qs=self.REQUEST.SESSION['query']	qs=self.REQUEST.SESSION['query']
#qs=re.sub(r'_','-',qs) #aendern f�r query	#qs=re.sub(r'_','-',qs) #aendern fuer query
queries=string.split(qs,",")	queries=string.split(qs,",")


Line 918 class ZSQLExtendFolder(Folder,Persistent	Line 1257 class ZSQLExtendFolder(Folder,Persistent

newquerystring=string.join(newquery,"&")	newquerystring=string.join(newquery,"&")

return "<a href='%s'>%s</a>"%(self.actualPath()+"?"+newquerystring,html)	return "<a href='%s'>%s</a>"%(self.REQUEST['URL']+"?"+newquerystring,html)



Line 1043 class ZSQLBibliography(Folder,ZSQLExtend	Line 1382 class ZSQLBibliography(Folder,ZSQLExtend

def changeZSQLBibliographyForm(self):	def changeZSQLBibliographyForm(self):
"""change folder config"""	"""change folder config"""
pt=PageTemplateFile('Products/ZSQLExtend/zpt/changeZSQLBibliographyForm.zpt').__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changeZSQLBibliographyForm.zpt')).__of__(self)
return pt()	return pt()


Line 1054 class ZSQLBibliography(Folder,ZSQLExtend	Line 1393 class ZSQLBibliography(Folder,ZSQLExtend
obj=getattr(self,"ZSQLBibliography_template")	obj=getattr(self,"ZSQLBibliography_template")
return obj()	return obj()
except:	except:
pt=PageTemplateFile('Products/ZSQLExtend/zpt/ZSQLBibliography_template_standard.zpt').__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ZSQLBibliography_template_standard.zpt')).__of__(self)
pt.content_type="text/html"	pt.content_type="text/html"
return pt()	return pt()

def changeZSQLBibliography(self,tableName,label,description,REQUEST=None):	def changeZSQLBibliography(self,tableName,label,description,connection_id=None,REQUEST=None):
"""change it"""	"""change it"""
	self.connection_id=connection_id
self.tableName=tableName	self.tableName=tableName
self.label=label	self.label=label
self.description=description	self.description=description
Line 1069 class ZSQLBibliography(Folder,ZSQLExtend	Line 1409 class ZSQLBibliography(Folder,ZSQLExtend

manage_options=Folder.manage_options+(	manage_options=Folder.manage_options+(
{'label':'Main Config','action':'changeZSQLBibliographyForm'},	{'label':'Main Config','action':'changeZSQLBibliographyForm'},
	{'label':'Generate RDF Template','action':'generateRDFTemplate'},
	{'label':'Generate XML Template','action':'generateXMLTemplate'},
)	)


Line 1133 class ZSQLBibliography(Folder,ZSQLExtend	Line 1475 class ZSQLBibliography(Folder,ZSQLExtend

return retdata,fieldlist	return retdata,fieldlist

	def createRDFTag(self,tag,content,namespace="cdli"):
	"""create RDF"""
	if content:
	tag=namespace+":"+tag
	if (type(content) is StringType) or (type(content) is UnicodeType):
	ret=""" <%s>%s</%s>"""%(tag,escape(content),tag)
	else:
	ret=""" <%s>%s</%s>"""%(tag,content,tag)
	return ret.decode('latin-1')
	else:
	return ""

def createIndexTag(self,tag,content):	def createIndexTag(self,tag,content):
"""creste tag"""	"""create tag"""

if content:	if content:
	if (type(content) is StringType) or (type(content) is UnicodeType):
	ret=""" <%s>%s</%s>"""%(tag,escape(content),tag)
	else:
ret="""<%s>%s</%s>"""%(tag,content,tag)	ret="""<%s>%s</%s>"""%(tag,content,tag)
return ret	return ret.decode('latin-1')

else:	else:
return ""	return ""

def getMetaDataXML2(self):	def getXML2(self):
"""crate index meta"""	"""crate index meta"""

fn=os.path.splitext(self.REQUEST['fn'])[0]+"."	fn=os.path.splitext(self.REQUEST['fn'])[0]+"."
self.REQUEST['fn']=fn	self.REQUEST['fn']=fn

pt=PageTemplateFile('Products/ZSQLExtend/zpt/record2.xml').__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','record2.xml')).__of__(self)
pt.content_type="text/xml"	pt.content_type="text/xml"
return pt()	return pt()


	def generateRDFTemplate(self,REQUEST=None):
	"""generateRDFtemplate"""
	zt=ZopePageTemplate('record.rdf')
	self._setObject('record.rdf',zt)
	default_content_fn = os.path.join(package_home(globals()),
	'zpt','record.rdf')
	text = open(default_content_fn).read()
	zt.pt_edit(text, 'text/xml')


	if REQUEST is not None:
	return self.manage_main(self, REQUEST)

	def generateXMLTemplate(self,REQUEST=None):
	"""generateXMLtemplate"""
	zt=ZopePageTemplate('record.xml')
	self._setObject('record.xml',zt)
	default_content_fn = os.path.join(package_home(globals()),
	'zpt','record.xml')
	text = open(default_content_fn).read()
	zt.pt_edit(text, 'text/xml')


	if REQUEST is not None:
	return self.manage_main(self, REQUEST)
	def getMetaDataRDF(self):
	"""crate index meta"""
	find=self.ZopeFind(self,obj_ids=["record.rdf"])
	if not find:
	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','record.rdf')).__of__(self)
	pt.content_type="text/xml"
	return pt()
	else:
	return find[0][1]()

def getMetaDataXML(self):	def getMetaDataXML(self):
"""crate index meta"""	"""crate index meta"""
pt=PageTemplateFile('Products/ZSQLExtend/zpt/record.xml').__of__(self)	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"	pt.content_type="text/xml"
return pt()	return pt()
	else:
	return find[0][1]()


def getMetaDatasXML(self):	def getMetaDatasXML(self):
"""index"""	"""index"""
Line 1188 manage_addZSQLBibliographyForm=DTMLFile(	Line 1588 manage_addZSQLBibliographyForm=DTMLFile(
def manage_addZSQLBibliography(self, id, tableName,label,description,title='',	def manage_addZSQLBibliography(self, id, tableName,label,description,title='',
createPublic=0,	createPublic=0,
createUserF=0,	createUserF=0,
	connection_id=None,
REQUEST=None):	REQUEST=None):
"""Add a new Folder object with id id.	"""Add a new Folder object with id id.

Line 1205 def manage_addZSQLBibliography(self, id,	Line 1606 def manage_addZSQLBibliography(self, id,
setattr(ob,'tableName',tableName)	setattr(ob,'tableName',tableName)
setattr(ob,'label',label)	setattr(ob,'label',label)
setattr(ob,'description',description)	setattr(ob,'description',description)
	setattr(ob,'connection_id',connection_id)

checkPermission=getSecurityManager().checkPermission	checkPermission=getSecurityManager().checkPermission

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

Removed from v.1.43
changed lines
	Added in v.1.73