ECHO_content/VLPExtension.py - diff

Return to VLPExtension.py CVS log

Up to [Repository] / ECHO_content

version 1.93, 2010/09/14 12:44:57	version 1.95, 2012/01/03 13:02:31
Line 310 class VLP_essay(Folder):	Line 310 class VLP_essay(Folder):
#txt=pages[int(pagenum)-1][1].data.decode('utf-8')	#txt=pages[int(pagenum)-1][1].data.decode('utf-8')
txt=pages[int(pagenum)-1][1].data	txt=pages[int(pagenum)-1][1].data
#print txt.encode('utf-8')	#print txt.encode('utf-8')
return self.xml2html(makeXML(txt),quote="no")	tmp =makeXML(txt)
	logging.debug(txt)
	return self.xml2html(tmp,quote="no")
else:	else:
return self.xml2html(makeXML(pages[int(pagenum)-1][1]()),quote="no")	return self.xml2html(makeXML(pages[int(pagenum)-1][1]()),quote="no")

Line 980 class VLP_resource(ECHO_resource,Cacheab	Line 982 class VLP_resource(ECHO_resource,Cacheab

else:	else:

self._setObject('fulltext',ECHO_fullText(id,''))	self._setObject('fulltext',ECHO_fullText('fulltext',''))

try:	try:
getattr(self,'fulltext').pt_edit(re3.encode('utf-8','ignore'),'text/xml')	getattr(self,'fulltext').pt_edit(re3.encode('utf-8','ignore'),'text/xml')