ECHO_content/vlp_xmlhelpers.py - diff

Return to vlp_xmlhelpers.py CVS log

Up to [Repository] / ECHO_content

Diff for /ECHO_content/vlp_xmlhelpers.py between versions 1.14 and 1.18.2.2

version 1.14, 2008/08/05 16:17:46	version 1.18.2.2, 2012/08/29 07:53:31
Line 192 def link2html(self,str):	Line 192 def link2html(self,str):

str=re.sub("\&","&",str)	str=re.sub("\&","&",str)
dom=xml.dom.minidom.parseString("<?xml version='1.0' encoding='utf-8'?><txt>"+utf8ify(str)+"</txt>")	dom=xml.dom.minidom.parseString("<?xml version='1.0' encoding='utf-8'?><txt>"+utf8ify(str)+"</txt>")


links=dom.getElementsByTagName("link")	links=dom.getElementsByTagName("link")


Line 200 def link2html(self,str):	Line 202 def link2html(self,str):
ref=link.getAttribute("ref")	ref=link.getAttribute("ref")
pn=link.getAttribute("page")	pn=link.getAttribute("page")
mk=link.getAttribute("mk")	mk=link.getAttribute("mk")
	href= link.getAttribute("href")
	if href:
	link.setAttribute("class","external")

if self.checkRef(ref):	if self.checkRef(ref):
more = ""	more = ""
Line 211 def link2html(self,str):	Line 216 def link2html(self,str):

link.setAttribute("href",self.REQUEST['SERVER_URL']+"/references?id="+ref+more)	link.setAttribute("href",self.REQUEST['SERVER_URL']+"/references?id="+ref+more)


newxml=dom.toxml('utf-8')	newxml=dom.toxml('utf-8')



retStr=regexpTXT.search(newxml)	retStr=regexpTXT.search(newxml)
retStr = retStr.group(1)	retStr = retStr.group(1)

Line 232 def related2html(self,str):	Line 240 def related2html(self,str):
link.tagName = "a"	link.tagName = "a"
ref = link.getAttribute("ref")	ref = link.getAttribute("ref")
pn = link.getAttribute("page")	pn = link.getAttribute("page")
	obj = ref[0:3]

	"""erweiterung der related items von literatur auf weitere datenbankobjekte, mb 09.06.2009"""
	searchStr = ''
	if obj == 'lit':
searchStr="select fullreference, online from vl_literature where reference =\'%s\' and authorized = 1"%(ref)	searchStr="select fullreference, online from vl_literature where reference =\'%s\' and authorized = 1"%(ref)
	elif obj == 'sit':
	searchStr="select reference from vl_sites where reference =\'%s\' and complete = 'yes'"%(ref)
	elif obj == 'per':
	searchStr="select reference from vl_people where reference =\'%s\' and complete = 'yes'"%(ref)
	elif obj == 'tec':
	searchStr="select reference from vl_technology where reference =\'%s\' and complete = 'yes'"%(ref)
	elif obj == 'exp':
	searchStr="select reference from vl_experiments where reference =\'%s\' and complete = 'yes'"%(ref)

res = self.search(var=searchStr)	res = self.search(var=searchStr)

if res:	if res:
	if obj == 'lit':
if res[0]['online'] == 1:	if res[0]['online'] == 1:
# item online verfuegbar	# literatur item online verfuegbar
if pn:	if pn:
link.setAttribute("href",self.REQUEST['SERVER_URL']+"/references?id="+ref+"&page="+pn)	link.setAttribute("href",self.REQUEST['SERVER_URL']+"/references?id="+ref+"&page="+pn)
else:	else:
link.setAttribute("href",self.REQUEST['SERVER_URL']+"/references?id="+ref)	link.setAttribute("href",self.REQUEST['SERVER_URL']+"/references?id="+ref)

link.setAttribute("title", "click to view")	link.setAttribute("title", "click to view!")
link.removeAttribute("ref")	link.removeAttribute("ref")

# prefix preceding the link	# prefix preceding the link
Line 252 def related2html(self,str):	Line 274 def related2html(self,str):
dom.documentElement.insertBefore(prefix, link)	dom.documentElement.insertBefore(prefix, link)

else:	else:
# item nur als bibliographische angabe vorhanden	# literatur item nur als bibliographische angabe vorhanden
link.setAttribute("alt", unicodify(res[0]['fullreference']))	link.setAttribute("alt", unicodify(res[0]['fullreference']))
link.setAttribute("title", "click to expand")	link.setAttribute("title", "click to expand")
link.setAttribute("onclick", "return toggle(this);")	link.setAttribute("onclick", "return toggle(this);")
Line 260 def related2html(self,str):	Line 282 def related2html(self,str):

# prefix inside link text	# prefix inside link text
link.firstChild.data = '+ ' + link.firstChild.data	link.firstChild.data = '+ ' + link.firstChild.data
	else:
	# links zu den anderen datenbankobjekten
	link.setAttribute("href",self.REQUEST['SERVER_URL']+"/references?id="+ref)
	link.setAttribute("title", "click to view")
	link.removeAttribute("ref")

	# prefix preceding the link
	prefix = dom.createTextNode(U"\u2013\u0020") # = ndash + space
	dom.documentElement.insertBefore(prefix, link)

	else:
	# objekt nicht verfuegbar/freigegeben oder (web)link mit href statt ref

	try:
	link.removeAttribute("ref")
	link.setAttribute("title", ref)
	except:
	pass


	# prefix preceding the link
	prefix = dom.createTextNode(U"\u2013\u0020") # = ndash + space
	dom.documentElement.insertBefore(prefix, link)


newxml=dom.toxml('utf-8')	newxml=dom.toxml('utf-8')
Line 273 def related2html(self,str):	Line 318 def related2html(self,str):




def xml2html(self,str,quote="yes"):	def xml2html(self,str,quote="yes"):
"""link2html fuer VLP muss hier noch raus"""	"""link2html fuer VLP muss hier noch raus"""
if str:	if str:
if quote=="yes2":	if quote=="yes2":
str=re.sub("\&","&",str)	str=re.sub("\&","&",str)
#dom=xml.dom.minidom.parseString(str)	#dom=xml.dom.minidom.parseString(str)
	logging.debug(str)
dom = NonvalidatingReader.parseString(str,"http://www.mpiwg-berlin.mpg.de/")	dom = NonvalidatingReader.parseString(str,"http://www.mpiwg-berlin.mpg.de/")
#links=dom.getElementsByTagName("link")	#links=dom.getElementsByTagName("link")
links=Ft.Xml.XPath.Evaluate(".//link", contextNode=dom)	links=Ft.Xml.XPath.Evaluate(".//link", contextNode=dom)

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

Removed from v.1.14
changed lines
	Added in v.1.18.2.2