ZSQLExtend/ZSQLExtend.py - diff

Return to ZSQLExtend.py CVS log

Up to [Repository] / ZSQLExtend

Diff for /ZSQLExtend/ZSQLExtend.py between versions 1.32 and 1.69

version 1.32, 2004/08/27 23:03:48	version 1.69, 2005/10/14 15:08:18
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
from pyPgSQL import libpq	import sys
	#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


	def analyseIntSearch(word):
	#analyse integer searches

	splitted=word.split("-")

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

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

	if splitted[1]=='':
	return "> "+splitted[0]
	else:
	return "BETWEEN "+splitted[0]+" AND "+splitted[1]



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

def showSQLConnectionIDs(self):	def showSQLConnectionIDs(self):
return SQLConnectionIDs(self)	return SQLConnectionIDs(self)
Line 20 class ZSQLExtendFolder(Folder,Persistent	Line 52 class ZSQLExtendFolder(Folder,Persistent
"""Folder"""	"""Folder"""
meta_type="ZSQLExtendFolder"	meta_type="ZSQLExtendFolder"


	def testneu(self):
	"""test"""
	relStatement="""period like '%s%%'"""
	statement="select * from cdli_cat"
	wherePart="museum_no like 'VAT%'"
	classes=['Uruk III','Uruk IV']
	return self.searchRel(relStatement,statement,wherePart,classes)

	def URLquote(self,txt):
	"""urlquote"""
	return urllib.quote(txt)
	def searchRel(self,relStatement,statement,wherePart,classes):
	"""suche relative haufigkeiten"""
	ret={}
	allRecords=len(self.ZSQLSimpleSearch(statement + " where "+wherePart))

	for oneclass in classes:
	ret[oneclass]=len(self.ZSQLSimpleSearch(statement + " where ("+wherePart+") and "+ relStatement%oneclass))

	return (ret,allRecords)

def content_html(self):	def content_html(self):
"""template fuer content"""	"""template fuer content"""

Line 27 class ZSQLExtendFolder(Folder,Persistent	Line 81 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 60 class ZSQLExtendFolder(Folder,Persistent	Line 114 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 151 class ZSQLExtendFolder(Folder,Persistent	Line 205 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 161 class ZSQLExtendFolder(Folder,Persistent	Line 215 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 ""

def ZSQLOptionsFromCRList(self,fieldname,listField, multiple=''):	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='',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 189 class ZSQLExtendFolder(Folder,Persistent	Line 289 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 217 class ZSQLExtendFolder(Folder,Persistent	Line 324 class ZSQLExtendFolder(Folder,Persistent

def ZSQLInlineSearch(self,storename=None,**argv):	def ZSQLInlineSearch(self,storename=None,**argv):
"""inlinesearch"""	"""inlinesearch"""

qs=[]	qs=[]
if storename:	if storename:
"""store"""	"""store"""
Line 227 class ZSQLExtendFolder(Folder,Persistent	Line 335 class ZSQLExtendFolder(Folder,Persistent

#print "INLINE:",argv	#print "INLINE:",argv
for a in argv.keys():	for a in argv.keys():
	try:
	qs.append(a+"="+urllib.quote(str(argv[a])))
	except:
	import urllib
qs.append(a+"="+urllib.quote(str(argv[a])))	qs.append(a+"="+urllib.quote(str(argv[a])))

#return []	#return []
return self.parseQueryString(string.join(qs,","),"_",storename=storename)	return self.parseQueryString(string.join(qs,","),"_",storename=storename)

Line 235 class ZSQLExtendFolder(Folder,Persistent	Line 348 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"""

if not query:	if not query:
query=self.query	query=self.query
	if getattr(self,'_v_search',None):

	return self._v_search(var=query)

if self.search.meta_type=="Z SQL Method":	if hasattr(self,'search') and (self.search.meta_type=="Z SQL Method"):
	self._v_search=self.search
return self.search(var=query)	return self.search(var=query)
else:	else:
if self.aq_parent.aq_parent.search.meta_type=="Z SQL Method":	if hasattr(self.aq_parent.aq_parent,'search') and (self.aq_parent.aq_parent.search.meta_type=="Z SQL Method"):
	self._v_search=self.aq_parent.aq_parent.search
return self.aq_parent.aq_parent.search(var=query)	return self.aq_parent.aq_parent.search(var=query)
else:	else:
	search=self.ZopeFind(self,obj_metatypes=["Z SQL Method"],search_sub=1)
	if search:
	self._v_search=search[0][1]
	return search[0][1](var=query)
	else:
return []	return []



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 269 class ZSQLExtendFolder(Folder,Persistent	Line 444 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=[]
valueList=[]	valueList=[]
for x in addList.keys():	for x in addList.keys():
keyList.append("\""+x+"\"")	keyList.append("\""+x+"\"")
valueList.append(libpq.PgQuoteString(addList[x]))	valueList.append(sql_quote(addList[x]))

keyString=string.join(keyList,",")	keyString=string.join(keyList,",")
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:
"""�ndern von Eintr�gen"""	return RESPONSE.redirect(format)
	else:
	return True

	def ZSQLChange(self,format=None,RESPONSE=None,USE_FORM=None,**argv):
	"""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=[]
for q in qs.split("&"):
name=urllib.unquote(re.sub("r'+'"," ",q.split("=")[0].lower()))
value=q.split("=")[1]
value=re.sub(r'\+'," ",value)
value=urllib.unquote(value)
if name=="-table":
table=urllib.unquote(value)
elif name=="-identify":
identify=urllib.unquote(value)
identify=identify.split("=")[0]+"="+libpq.PgQuoteString(identify.split("=")[1])
elif name=="-format":
format=urllib.unquote(value)
elif (not name[0]=="-") and (not len(value)==0):
changeList.append("\""+name+"\"="+libpq.PgQuoteString(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):	if field[0]=="_":
"""�ndern von Eintr�gen"""	fieldTmp="-"+field[1:]
qs=self.REQUEST['QUERY_STRING']	else:
#print "CHANGE QS",self.REQUEST	fieldTmp=field
#return self.REQUEST
	qs_temp.append("%s=%s"%(fieldTmp,argv[field]))

	qs=string.join(qs_temp,",")
changeList=[]	changeList=[]
for q in qs.split("&"):
	for q in qs.split(","):

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":
identify=urllib.unquote(value)	identify=urllib.unquote(value)
identify=identify.split("=")[0]+"="+libpq.PgQuoteString(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+"\"="+libpq.PgQuoteString(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)
return self.REQUEST.RESPONSE.redirect(format)

	self.ZSQLSimpleSearch(queryString)


def ZSQLFind2(self,qs="",select="oid,",storename=None,tableList=['cdli_translit','cdli_cat'],*argv):	if RESPONSE and format:
"""find2"""	return RESPONSE.redirect(format)
#search1= self.ZSQLFind(qs="",select="oid,",storename=None,tableExt='cdli_translit',restrictField='id_text',NoQuery='yes',NoLimit='yes',*argv)	else:
	return True


#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,*argv):
	def ZSQLFind(self,qs="",select="oid,",storename=None,tableExt=None,NoQuery=None,NoLimit=None,restrictField=None,restrictConnect=None,filter=None,*argv):
"""Find"""	"""Find"""

def delEmpty(list):	def delEmpty(list):
Line 371 class ZSQLExtendFolder(Folder,Persistent	Line 539 class ZSQLExtendFolder(Folder,Persistent
ret.append(x)	ret.append(x)
return ret	return ret

#self.REQUEST.SESSION['come_from_search']="no" # zur�cksetzen

	#self.REQUEST.SESSION['come_from_search']="no" # zuruecksetzen
if qs=="":	if qs=="":
print "HI"
if self.REQUEST['QUERY_STRING']:	if self.REQUEST['QUERY_STRING']:
qs=self.REQUEST['QUERY_STRING']	qs=self.REQUEST['QUERY_STRING']

Line 381 class ZSQLExtendFolder(Folder,Persistent	Line 551 class ZSQLExtendFolder(Folder,Persistent
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','')
print "QS:",qs
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 408 class ZSQLExtendFolder(Folder,Persistent	Line 588 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)	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"]

print "called query"

return ret	return ret

def ZSQLFoundCountLen(self,var):	def ZSQLFoundCountLen(self,var):
Line 469 class ZSQLExtendFolder(Folder,Persistent	Line 652 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 parseQueryString(self,qs,iCT,storemax="no",select=None,nostore=None,storename=None,tableExt=None,NoQuery=None,NoLimit=None,restrictField=None,restrictConnect=None):	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):
"""analysieren den QueryString"""	"""analysieren den QueryString"""
#print "NO",nostore

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
	sortAllFields=None
skip=""	skip=""
rangeStart=0	rangeStart=0
limit=0	limit=0
Line 490 class ZSQLExtendFolder(Folder,Persistent	Line 727 class ZSQLExtendFolder(Folder,Persistent
#print "Q",nostore,qs	#print "Q",nostore,qs
#check for op	#check for op




splitted=qs.split(",")	splitted=qs.split(",")
if tableExt:	if tableExt:
table=tableExt	table=tableExt
Line 516 class ZSQLExtendFolder(Folder,Persistent	Line 756 class ZSQLExtendFolder(Folder,Persistent

field=name[5:]	field=name[5:]
lopfields[field]=lop	lopfields[field]=lop

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

	field=name[11:]
	sortAllFields=None
	#no field selected
	if field=="":
	sortAllFields=value
	else:
	sortfields[field]=value

#print "HI",op,field	#print "HI",op,field
#print opfieldsa	#print opfieldsa
#now analyse the querystring	#now analyse the querystring

for q in qs.split(","):	for q in qs.split(","):


Line 530 class ZSQLExtendFolder(Folder,Persistent	Line 783 class ZSQLExtendFolder(Folder,Persistent
except:	except:
value=""	value=""

#value=libpq.PgQuoteString(value)	#value=sql_quote(value)


if name==iCT+"lop":	if name==iCT+"lop":
Line 551 class ZSQLExtendFolder(Folder,Persistent	Line 804 class ZSQLExtendFolder(Folder,Persistent
elif name==iCT+"join":	elif name==iCT+"join":
whereList.append(value)	whereList.append(value)
elif name==iCT+"sort":	elif name==iCT+"sort":
sort="ORDER BY "+value.replace(' AND ',',')	sortstrs=[]
	for word in value.split(','):
	wordstr=word.lstrip().rstrip()
	if sortAllFields:
	order=sortAllFields
	else:
	order=sortfields.get(wordstr,'ASC')

	if not (wordstr == ""):
	sortstrs.append(wordstr+" "+order)
	if len(sortstrs)>0:
	sort="ORDER BY "+string.join(sortstrs,',')


elif name==iCT+"token":	elif name==iCT+"token":
if not nostore=="yes":	if not nostore=="yes":
self.REQUEST.SESSION['token']=value	self.REQUEST.SESSION['token']=value
Line 573 class ZSQLExtendFolder(Folder,Persistent	Line 839 class ZSQLExtendFolder(Folder,Persistent
namealt=name	namealt=name
name="LOWER("+name+")"	name="LOWER("+name+")"
if op=="ct":	if op=="ct":
tmp=(name+" LIKE "+libpq.PgQuoteString("%"+value+"%"))	tmp=(name+" LIKE "+sql_quote("%"+value+"%"))
elif op=="gt":	elif op=="gt":
tmp=(name+">"+libpq.PgQuoteString(value))	tmp=(name+">"+sql_quote(value))
elif op=="lt":	elif op=="lt":
tmp=(name+"<"+libpq.PgQuoteString(value))	tmp=(name+"<"+sql_quote(value))
elif op=="eq":	elif op=="eq":
tmp=(name+"="+libpq.PgQuoteString(value))	tmp=(name+"="+sql_quote(value))
elif op=="bw":	elif op=="bw":
tmp=(name+" LIKE "+libpq.PgQuoteString(value+"%"))	tmp=(name+" LIKE "+sql_quote(value+"%"))
elif op=="ew":	elif op=="ew":
tmp=(name+" LIKE "+libpq.PgQuoteString("%"+value))	tmp=(name+" LIKE "+sql_quote("%"+value))
op="ct"	elif op=="all":
print "TTT",tableExt	tmps=[]
if (not tableExt) or (namealt.split('.')[0]==tableExt):	for word in value.split(" "):
if searchFields.has_key(name):	tmps.append(name+" LIKE "+sql_quote("%"+word+"%"))
searchFields[name]+=lopfields.get(name,'OR')+" "+tmp
searchFieldsOnly[name]+=lopfields.get(name,'OR')+" "+value	tmp=string.join(tmps,' AND ')
else:
searchFields[name]=tmp	elif op=="numerical":
searchFieldsOnly[name]=value	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 ')

## for name in searchFields.keys():	op="all"
## value=searchFields[name]

## if opfields.has_key(name):	if (not tableExt) or (namealt.split('.')[0]==tableExt):
## op=opfields[name]	if searchFields.has_key(namealt):
## else:	searchFields[namealt]+=lopfields.get(name,'OR')+" "+tmp
## op="ct"	searchFieldsOnly[namealt]+=lopfields.get(name,'OR')+" "+value
## name="LOWER("+name+")"	else:
## if op=="ct":	searchFields[namealt]=tmp
## whereList.append(name+" LIKE "+libpq.PgQuoteString("%"+value+"%"))	searchFieldsOnly[namealt]=value
## elif op=="gt":
## whereList.append(name+">"+libpq.PgQuoteString(value))
## elif op=="lt":
## whereList.append(name+"<"+libpq.PgQuoteString(value))
## elif op=="eq":
## whereList.append(name+"="+libpq.PgQuoteString(value))
## elif op=="bw":
## whereList.append(name+" LIKE "+libpq.PgQuoteString(value+"%"))
## elif op=="ew":
## whereList.append(name+" LIKE "+libpq.PgQuoteString("%"+value))
## op="ct"

## #except:
## # print "END",value,name,Exception

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

if len(whereList)>0:	if len(whereList)>0:
	if filter:
where="WHERE "+string.join(whereList," "+lop+" ")	whereStr="("+string.join(whereList," "+lop+" ")+") AND "+filter
	else:
	whereStr=string.join(whereList," "+lop+" ")
	where="WHERE "+whereStr
	else:
	if filter:
	where="WHERE "+filter
else:	else:
where=""	where=""

if restrictConnect:	if restrictConnect:
print "resticted"
if len(where)==0:	if len(where)==0:
where="WHERE "+restrictConnect[0]+" in ("+restrictConnect[1]+")"	where="WHERE "+restrictConnect[0]+" in ("+restrictConnect[1]+")"
else:	else:
where+="and "+restrictConnect[0]+" in ("+restrictConnect[1]+")"	where+="and "+restrictConnect[0]+" in ("+restrictConnect[1]+")"

#print "QE",table	#print "QE",table
	#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"%(select,table,where,sort,maxstr,skip)

if not nostore=="yes":	if not nostore=="yes":
Line 646 class ZSQLExtendFolder(Folder,Persistent	Line 912 class ZSQLExtendFolder(Folder,Persistent

if storename and (not NoQuery):	if storename and (not NoQuery):
query2="SELECT count(*) FROM %s %s"%(table,where)	query2="SELECT count(*) FROM %s %s"%(table,where)
print "storing",query2
#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'):
print "HI",storename
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:
print "go"
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 676 class ZSQLExtendFolder(Folder,Persistent	Line 950 class ZSQLExtendFolder(Folder,Persistent
self.REQUEST.SESSION[storename]['searchFieldsOnly']=searchFieldsOnly	self.REQUEST.SESSION[storename]['searchFieldsOnly']=searchFieldsOnly

if not NoQuery:	if not NoQuery:
print "noquery",query
return self.ZSQLQuery(query)	return self.ZSQLQuery(query)
else:	else:
print "query"
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"""
	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']	rq=self.REQUEST['QUERY_STRING']

querys=rq.split("&")	querys=rq.split("&")


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

for querytemp in querys:	for querytemp in querys:
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"""	"""nothing"""


#print formatfile	#print formatfile


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 728 class ZSQLExtendFolder(Folder,Persistent	Line 1028 class ZSQLExtendFolder(Folder,Persistent

def nextLink(self,html,storename="foundCount"):	def nextLink(self,html,storename="foundCount"):
"""nextLink"""	"""nextLink"""

try:	try:
limit=self.REQUEST.SESSION[storename]['rangeSize']	limit=self.REQUEST.SESSION[storename]['rangeSize']
if int(limit)==0 :	if int(limit)==0 :
Line 746 class ZSQLExtendFolder(Folder,Persistent	Line 1047 class ZSQLExtendFolder(Folder,Persistent
if self.REQUEST['QUERY_STRING']=="":	if self.REQUEST['QUERY_STRING']=="":
qs=self.REQUEST.SESSION['query']	qs=self.REQUEST.SESSION['query']

queries=string.split(qs,",")	queries=string.split(qs,",")[0:]


else:	else:
qs=self.REQUEST['QUERY_STRING']	qs=self.REQUEST['QUERY_STRING']
queries=string.split(qs,"&")	queries=string.split(qs,"&")[0:]



Line 761 class ZSQLExtendFolder(Folder,Persistent	Line 1062 class ZSQLExtendFolder(Folder,Persistent

for query in queries:	for query in queries:

#print query.split("=")[0]	if query[0]=="_" : query="-"+query[1:]
if query[0]=="_" : query[0]="-"

if query.split("=")[0].lower()=="-skip":	if query.split("=")[0].lower()=="-skip":

Line 775 class ZSQLExtendFolder(Folder,Persistent	Line 1075 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"):
"""prev link"""	"""prev link"""

try:	try:
limit=self.REQUEST.SESSION[storename]['rangeSize']	limit=self.REQUEST.SESSION[storename]['rangeSize']
if int(limit)==0 :	if int(limit)==0 :
Line 801 class ZSQLExtendFolder(Folder,Persistent	Line 1102 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 832 class ZSQLExtendFolder(Folder,Persistent	Line 1133 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 957 class ZSQLBibliography(Folder,ZSQLExtend	Line 1258 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 968 class ZSQLBibliography(Folder,ZSQLExtend	Line 1269 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 983 class ZSQLBibliography(Folder,ZSQLExtend	Line 1285 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 1047 class ZSQLBibliography(Folder,ZSQLExtend	Line 1351 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"
	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"	pt.content_type="text/xml"
return pt()	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"""
	# check if the request's host part was OK
	http_host = self.REQUEST['HTTP_HOST']
	host_port = self.REQUEST['SERVER_PORT']
	fix_host = None
	if http_host and http_host.rfind(host_port) == -1:
	print "HTTP_HOST needs fixing!"
	fix_host = http_host + ":" + host_port

ret="""<?xml version="1.0" ?>	ret="""<?xml version="1.0" ?>
<index>"""	<index>"""
for found in self.ZSQLSimpleSearch("select oid from %s limit ALL"%self.tableName):	for found in self.ZSQLSimpleSearch("select oid from %s limit ALL"%self.tableName):
link=self.absolute_url()+"/"+"record.html?oid=%i"%found.oid	base_url = self.absolute_url()
metalink=self.absolute_url()+"/"+"getMetaDataXML?oid=%i"%found.oid	if fix_host:
	#print "replacing ", http_host, " by ", fix_host
	base_url = string.replace(base_url, http_host, fix_host, 1)

	link=base_url+"/"+"record.html?oid=%i"%found.oid
	metalink=base_url+"/"+"getMetaDataXML?oid=%i"%found.oid

ret+="""<resource resourceLink="%s" metaLink="%s"/>\n"""%(link,metalink)	ret+="""<resource resourceLink="%s" metaLink="%s"/>\n"""%(link,metalink)

Line 1089 manage_addZSQLBibliographyForm=DTMLFile(	Line 1464 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 1106 def manage_addZSQLBibliography(self, id,	Line 1482 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.32
changed lines
	Added in v.1.69