documentViewer/documentViewer.py - diff

Return to documentViewer.py CVS log

Up to [Repository] / documentViewer

Diff for /documentViewer/documentViewer.py between versions 1.113 and 1.121

version 1.113, 2010/10/08 14:02:24	version 1.121, 2010/10/15 09:58:12
Line 5 from Products.PageTemplates.PageTemplate	Line 5 from Products.PageTemplates.PageTemplate
from AccessControl import ClassSecurityInfo	from AccessControl import ClassSecurityInfo
from AccessControl import getSecurityManager	from AccessControl import getSecurityManager
from Globals import package_home	from Globals import package_home
	from Products.zogiLib.zogiLib import browserCheck

from Ft.Xml import EMPTY_NAMESPACE, Parse	from Ft.Xml import EMPTY_NAMESPACE, Parse
import Ft.Xml.Domlette	import Ft.Xml.Domlette
Line 18 import urlparse	Line 19 import urlparse
import cStringIO	import cStringIO
import re	import re


def logger(txt,method,txt2):	def logger(txt,method,txt2):
"""logging"""	"""logging"""
logging.info(txt+ txt2)	logging.info(txt+ txt2)
Line 49 def serializeNode(node, encoding='utf-8'	Line 51 def serializeNode(node, encoding='utf-8'
buf.close()	buf.close()
return s	return s

	def getBrowserType(self):
	"""get browser type object"""
	if self.REQUEST.SESSION.has_key('browserType'):
	return self.REQUEST.SESSION['browserType']
	else:
	bt = browserCheck(self)
	self.REQUEST.SESSION.set('browserType', bt)
	logging.debug("documentViewer (BROWSER TYPE) bt %s"%bt)
	return bt


def getParentDir(path):	def getParentDir(path):
"""returns pathname shortened by one"""	"""returns pathname shortened by one"""
Line 174 class documentViewer(Folder):	Line 186 class documentViewer(Folder):
"""get search"""	"""get search"""
return self.template.fulltextclient.getSearch(**args)	return self.template.fulltextclient.getSearch(**args)

	def getGisPlaces(self, **args):
	"""get gis places"""
	return self.template.fulltextclient.getGisPlaces(**args)

	def getAllGisPlaces(self, **args):
	"""get all gis places"""
	return self.template.fulltextclient.getGisPlaces(**args)

def getNumPages(self, docinfo):	def getNumPages(self, docinfo):
"""get numpages"""	"""get numpages"""
return self.template.fulltextclient.getNumPages(docinfo)	return self.template.fulltextclient.getNumPages(docinfo)
Line 551 class documentViewer(Folder):	Line 571 class documentViewer(Folder):
#docinfo['numPages']=int(getTextFromNode(result[0]))	#docinfo['numPages']=int(getTextFromNode(result[0]))

#result =dom.xpath("//name")	#result =dom.xpath("//name")
docinfo['name']=getTextFromNode(dom.xpath("//name")[0])	docinfo['name']=getTextFromNode(dom.xpath("/resource/name")[0])
logging.debug("documentViewer docinfo[name] %s"%docinfo[name])	logging.debug("documentViewer docinfo[name] %s"%docinfo['name'])

#logging.debug("documentViewer (getbibinfofromindexmeta) using mapping for %s"%bibtype)	#logging.debug("documentViewer (getbibinfofromindexmeta) using mapping for %s"%bibtype)
return docinfo	return docinfo
Line 643 class documentViewer(Folder):	Line 663 class documentViewer(Folder):

presentationUrls = dom.xpath("//texttool/presentation")	presentationUrls = dom.xpath("//texttool/presentation")
docinfo = self.getBibinfoFromIndexMeta(url, docinfo=docinfo, dom=dom) # get info von bib tag	docinfo = self.getBibinfoFromIndexMeta(url, docinfo=docinfo, dom=dom) # get info von bib tag
#docinfo = self.getNameFromIndexMeta(url, docinfo=docinfo, dom=dom)	docinfo = self.getNameFromIndexMeta(url, docinfo=docinfo, dom=dom)

if presentationUrls and (len(presentationUrls) > 0): # ueberschreibe diese durch presentation informationen	if presentationUrls and (len(presentationUrls) > 0): # ueberschreibe diese durch presentation informationen
# presentation url ergiebt sich ersetzen von index.meta in der url der fuer die Metadaten	# presentation url ergiebt sich ersetzen von index.meta in der url der fuer die Metadaten

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

Removed from v.1.113
changed lines
	Added in v.1.121