documentViewer/documentViewer.py - diff

Return to documentViewer.py CVS log

Up to [Repository] / documentViewer

Diff for /documentViewer/documentViewer.py between versions 1.99 and 1.119

version 1.99, 2010/09/01 13:25:38	version 1.119, 2010/10/11 13:54:43
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 178 class documentViewer(Folder):	Line 190 class documentViewer(Folder):
"""get numpages"""	"""get numpages"""
return self.template.fulltextclient.getNumPages(docinfo)	return self.template.fulltextclient.getNumPages(docinfo)

	def getNumTextPages(self, docinfo):
	"""get numpages text"""
	return self.template.fulltextclient.getNumTextPages(docinfo)

def getTranslate(self, **args):	def getTranslate(self, **args):
"""get translate"""	"""get translate"""
return self.template.fulltextclient.getTranslate(**args)	return self.template.fulltextclient.getTranslate(**args)
Line 397 class documentViewer(Folder):	Line 413 class documentViewer(Folder):
regpath = regexp.match(url)	regpath = regexp.match(url)
if (regpath==None):	if (regpath==None):
return ""	return ""
	logging.debug("(getDomFromIndexMeta): URLXAXA: %s"%regpath.group(2))
return ("/mpiwg/online/"+regpath.group(1)+"/"+regpath.group(2))	return ("/mpiwg/online/"+regpath.group(1)+"/"+regpath.group(2))



def getIndexMetaUrl(self,url):	def getIndexMetaUrl(self,url):
"""returns utr of index.meta document at url"""	"""returns utr of index.meta document at url"""

Line 529 class documentViewer(Folder):	Line 547 class documentViewer(Folder):
return docinfo	return docinfo


	def getNameFromIndexMeta(self,path,docinfo=None,dom=None,cut=0):
	"""gets name info from the index.meta file at path or given by dom"""
	if docinfo is None:
	docinfo = {}

	if dom is None:
	for x in range(cut):
	path=getParentDir(path)
	dom = self.getDomFromIndexMeta(path)

	#docinfo['indexMetaPath']=self.getIndexMetaPath(path);

	#result= dom.xpath("//result/resultPage")
	#docinfo['numPages']=int(getTextFromNode(result[0]))

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

	#logging.debug("documentViewer (getbibinfofromindexmeta) using mapping for %s"%bibtype)
	return docinfo

def getDocinfoFromTextTool(self, url, dom=None, docinfo=None):	def getDocinfoFromTextTool(self, url, dom=None, docinfo=None):
"""parse texttool tag in index meta"""	"""parse texttool tag in index meta"""
logging.debug("documentViewer (getdocinfofromtexttool) url: %s" % (url))	logging.debug("documentViewer (getdocinfofromtexttool) url: %s" % (url))
Line 611 class documentViewer(Folder):	Line 651 class documentViewer(Folder):
docinfo['textURLPath'] = textUrl	docinfo['textURLPath'] = textUrl
if not docinfo['imagePath']:	if not docinfo['imagePath']:
# text-only, no page images	# text-only, no page images
docinfo = self.getNumPages(docinfo)	docinfo = self.getNumTextPages(docinfo)

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)

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.99
changed lines
	Added in v.1.119