documentViewer/documentViewer.py - diff

Return to documentViewer.py CVS log

Up to [Repository] / documentViewer

Diff for /documentViewer/documentViewer.py between versions 1.94 and 1.146

version 1.94, 2010/08/24 12:34:32	version 1.146, 2010/10/26 14:44:55
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 16 import logging	Line 17 import logging
import math	import math
import urlparse	import urlparse
import cStringIO	import cStringIO
	import re


def logger(txt,method,txt2):	def logger(txt,method,txt2):
"""logging"""	"""logging"""
Line 48 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 68 def getHttpData(url, data=None, num_trie	Line 81 def getHttpData(url, data=None, num_trie
errmsg = None	errmsg = None
for cnt in range(num_tries):	for cnt in range(num_tries):
try:	try:
#logging.debug("getHttpData(#%s %ss) url=%s"%(cnt+1,timeout,url))	logging.debug("getHttpData(#%s %ss) url=%s"%(cnt+1,timeout,url))
if sys.version_info < (2, 6):	if sys.version_info < (2, 6):
# set timeout on socket -- ugly :-(	# set timeout on socket -- ugly :-(
import socket	import socket
Line 79 def getHttpData(url, data=None, num_trie	Line 92 def getHttpData(url, data=None, num_trie
# check result?	# check result?
break	break
except urllib2.HTTPError, e:	except urllib2.HTTPError, e:
#logging.error("getHttpData: HTTP error(%s): %s"%(e.code,e))	logging.error("getHttpData: HTTP error(%s): %s"%(e.code,e))
errmsg = str(e)	errmsg = str(e)
# stop trying	# stop trying
break	break
except urllib2.URLError, e:	except urllib2.URLError, e:
#logging.error("getHttpData: URLLIB error(%s): %s"%(e.reason,e))	logging.error("getHttpData: URLLIB error(%s): %s"%(e.reason,e))
errmsg = str(e)	errmsg = str(e)
# stop trying	# stop trying
#break	#break
Line 173 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.getAllGisPlaces(**args)

	def getOrigPages(self, **args):
	"""get original page number """
	return self.template.fulltextclient.getOrigPages(**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)

	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 203 class documentViewer(Folder):	Line 232 class documentViewer(Folder):
@param viewMode: if images display images, if text display text, default is images (text,images or auto)	@param viewMode: if images display images, if text display text, default is images (text,images or auto)

'''	'''
#logging.debug("HHHHHHHHHHHHHH:load the rss")	logging.debug("HHHHHHHHHHHHHH:load the rss")
#logger("documentViewer (index)", logging.INFO, "mode: %s url:%s start:%s pn:%s"%(mode,url,start,pn))	logger("documentViewer (index)", logging.INFO, "mode: %s url:%s start:%s pn:%s"%(mode,url,start,pn))

if not hasattr(self, 'template'):	if not hasattr(self, 'template'):
# create template folder if it doesn't exist	# create template folder if it doesn't exist
Line 214 class documentViewer(Folder):	Line 243 class documentViewer(Folder):
self.digilibBaseUrl = self.findDigilibUrl() or "http://nausikaa.mpiwg-berlin.mpg.de/digitallibrary"	self.digilibBaseUrl = self.findDigilibUrl() or "http://nausikaa.mpiwg-berlin.mpg.de/digitallibrary"

docinfo = self.getDocinfo(mode=mode,url=url)	docinfo = self.getDocinfo(mode=mode,url=url)
	#pageinfo = self.getPageinfo(start=start,current=pn,docinfo=docinfo)
pageinfo = self.getPageinfo(start=start,current=pn,docinfo=docinfo)	pageinfo = self.getPageinfo(start=start,current=pn,docinfo=docinfo)
	''' ZDES '''
pt = getattr(self.template, 'thumbs_main_rss')	pt = getattr(self.template, 'thumbs_main_rss')

if viewMode=="auto": # automodus gewaehlt	if viewMode=="auto": # automodus gewaehlt
Line 226 class documentViewer(Folder):	Line 257 class documentViewer(Folder):
return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode)	return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode)

security.declareProtected('View','index_html')	security.declareProtected('View','index_html')
def index_html(self,url,mode="texttool",viewMode="auto",tocMode="thumbs",start=None,pn=1,mk=None, query=None, querySearch=None):	def index_html(self,url,mode="texttool",viewMode="auto",tocMode="thumbs",start=None,pn=1,mk=None, query=None, querySearch=None, characterNormalization=""):
'''	'''
view it	view it
@param mode: defines how to access the document behind url	@param mode: defines how to access the document behind url
Line 237 class documentViewer(Folder):	Line 268 class documentViewer(Folder):
@param querySearch: type of different search modes (fulltext, fulltextMorph, xpath, xquery, ftIndex, ftIndexMorph, fulltextMorphLemma)	@param querySearch: type of different search modes (fulltext, fulltextMorph, xpath, xquery, ftIndex, ftIndexMorph, fulltextMorphLemma)
'''	'''

#logging.debug("documentViewer (index) mode: %s url:%s start:%s pn:%s"%(mode,url,start,pn))	logging.debug("documentViewer (index) mode: %s url:%s start:%s pn:%s"%(mode,url,start,pn))

if not hasattr(self, 'template'):	if not hasattr(self, 'template'):
# this won't work	# this won't work
Line 323 class documentViewer(Folder):	Line 354 class documentViewer(Folder):
params[param] = str(val)	params[param] = str(val)

# quote values and assemble into query string	# quote values and assemble into query string
#logging.debug("XYXXXXX: %s"%repr(params.items()))	logging.debug("XYXXXXX: %s"%repr(params.items()))
ps = "&".join(["%s=%s"%(k,urllib.quote(v)) for (k, v) in params.items()])	ps = "&".join(["%s=%s"%(k,urllib.quote(v)) for (k, v) in params.items()])
url=self.REQUEST['URL1']+"?"+ps	url=self.REQUEST['URL1']+"?"+ps
return url	return url
Line 342 class documentViewer(Folder):	Line 373 class documentViewer(Folder):
def isAccessible(self, docinfo):	def isAccessible(self, docinfo):
"""returns if access to the resource is granted"""	"""returns if access to the resource is granted"""
access = docinfo.get('accessType', None)	access = docinfo.get('accessType', None)
#logging.debug("documentViewer (accessOK) access type %s"%access)	logging.debug("documentViewer (accessOK) access type %s"%access)
if access is not None and access == 'free':	if access is not None and access == 'free':
#logging.debug("documentViewer (accessOK) access is free")	logging.debug("documentViewer (accessOK) access is free")
return True	return True
elif access is None or access in self.authgroups:	elif access is None or access in self.authgroups:
# only local access -- only logged in users	# only local access -- only logged in users
user = getSecurityManager().getUser()	user = getSecurityManager().getUser()
#logging.debug("documentViewer (accessOK) user=%s ip=%s"%(user,self.REQUEST.getClientAddr()))	logging.debug("documentViewer (accessOK) user=%s ip=%s"%(user,self.REQUEST.getClientAddr()))
if user is not None:	if user is not None:
#print "user: ", user	#print "user: ", user
return (user.getUserName() != "Anonymous User")	return (user.getUserName() != "Anonymous User")
else:	else:
return False	return False

#logging.error("documentViewer (accessOK) unknown access type %s"%access)	logging.error("documentViewer (accessOK) unknown access type %s"%access)
return False	return False


Line 371 class documentViewer(Folder):	Line 402 class documentViewer(Folder):

infoUrl=self.digilibBaseUrl+"/dirInfo-xml.jsp?mo=dir&fn="+path	infoUrl=self.digilibBaseUrl+"/dirInfo-xml.jsp?mo=dir&fn="+path

#logging.debug("documentViewer (getparamfromdigilib) dirInfo from %s"%(infoUrl))	logging.debug("documentViewer (getparamfromdigilib) dirInfo from %s"%(infoUrl))

txt = getHttpData(infoUrl)	txt = getHttpData(infoUrl)
if txt is None:	if txt is None:
Line 379 class documentViewer(Folder):	Line 410 class documentViewer(Folder):

dom = Parse(txt)	dom = Parse(txt)
sizes=dom.xpath("//dir/size")	sizes=dom.xpath("//dir/size")
#logging.debug("documentViewer (getparamfromdigilib) dirInfo:size"%sizes)	logging.debug("documentViewer (getparamfromdigilib) dirInfo:size"%sizes)

if sizes:	if sizes:
docinfo['numPages'] = int(getTextFromNode(sizes[0]))	docinfo['numPages'] = int(getTextFromNode(sizes[0]))
Line 390 class documentViewer(Folder):	Line 421 class documentViewer(Folder):

return docinfo	return docinfo

	def getIndexMetaPath(self,url):
	"""gib nur den Pfad zurueck"""
	regexp = re.compile(r".(experimental\|permanent)/(.)")
	regpath = regexp.match(url)
	if (regpath==None):
	return ""
	logging.debug("(getDomFromIndexMeta): URLXAXA: %s"%regpath.group(2))
	return ("/mpiwg/online/"+regpath.group(1)+"/"+regpath.group(2))



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

def getIndexMeta(self, url):
"""returns dom of index.meta document at url"""
dom = None
metaUrl = None	metaUrl = None
if url.startswith("http://"):	if url.startswith("http://"):
# real URL	# real URL
Line 405 class documentViewer(Folder):	Line 446 class documentViewer(Folder):
if not metaUrl.endswith("index.meta"):	if not metaUrl.endswith("index.meta"):
metaUrl += "/index.meta"	metaUrl += "/index.meta"

#logging.debug("(getIndexMeta): METAURL: %s"%metaUrl)	return metaUrl

	def getDomFromIndexMeta(self, url):
	"""get dom from index meta"""
	dom = None
	metaUrl = self.getIndexMetaUrl(url)

	logging.debug("(getDomFromIndexMeta): METAURL: %s"%metaUrl)
txt=getHttpData(metaUrl)	txt=getHttpData(metaUrl)
if txt is None:	if txt is None:
raise IOError("Unable to read index meta from %s"%(url))	raise IOError("Unable to read index meta from %s"%(url))
Line 435 class documentViewer(Folder):	Line 483 class documentViewer(Folder):

def getAuthinfoFromIndexMeta(self,path,docinfo=None,dom=None,cut=0):	def getAuthinfoFromIndexMeta(self,path,docinfo=None,dom=None,cut=0):
"""gets authorization info from the index.meta file at path or given by dom"""	"""gets authorization info from the index.meta file at path or given by dom"""
#logging.debug("documentViewer (getauthinfofromindexmeta) path: %s"%(path))	logging.debug("documentViewer (getauthinfofromindexmeta) path: %s"%(path))

access = None	access = None

Line 445 class documentViewer(Folder):	Line 493 class documentViewer(Folder):
if dom is None:	if dom is None:
for x in range(cut):	for x in range(cut):
path=getParentDir(path)	path=getParentDir(path)
dom = self.getIndexMeta(path)	dom = self.getDomFromIndexMeta(path)

acctype = dom.xpath("//access-conditions/access/@type")	acctype = dom.xpath("//access-conditions/access/@type")
if acctype and (len(acctype)>0):	if acctype and (len(acctype)>0):
Line 459 class documentViewer(Folder):	Line 507 class documentViewer(Folder):

def getBibinfoFromIndexMeta(self,path,docinfo=None,dom=None,cut=0):	def getBibinfoFromIndexMeta(self,path,docinfo=None,dom=None,cut=0):
"""gets bibliographical info from the index.meta file at path or given by dom"""	"""gets bibliographical info from the index.meta file at path or given by dom"""
#logging.debug("documentViewer (getbibinfofromindexmeta) path: %s"%(path))	logging.debug("documentViewer (getbibinfofromindexmeta) path: %s"%(path))

if docinfo is None:	if docinfo is None:
docinfo = {}	docinfo = {}
Line 467 class documentViewer(Folder):	Line 515 class documentViewer(Folder):
if dom is None:	if dom is None:
for x in range(cut):	for x in range(cut):
path=getParentDir(path)	path=getParentDir(path)
dom = self.getIndexMeta(path)	dom = self.getDomFromIndexMeta(path)

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

#logging.debug("documentViewer (getbibinfofromindexmeta cutted) path: %s"%(path))	logging.debug("documentViewer (getbibinfofromindexmeta cutted) path: %s"%(path))
# put in all raw bib fields as dict "bib"	# put in all raw bib fields as dict "bib"
bib = dom.xpath("//bib/*")	bib = dom.xpath("//bib/*")
if bib and len(bib)>0:	if bib and len(bib)>0:
Line 489 class documentViewer(Folder):	Line 539 class documentViewer(Folder):
bibtype=bibtype.replace("-"," ") # wrong typesiin index meta "-" instead of " " (not wrong! ROC)	bibtype=bibtype.replace("-"," ") # wrong typesiin index meta "-" instead of " " (not wrong! ROC)
docinfo['bib_type'] = bibtype	docinfo['bib_type'] = bibtype
bibmap=metaData.generateMappingForType(bibtype)	bibmap=metaData.generateMappingForType(bibtype)
	logging.debug("documentViewer (getbibinfofromindexmeta) bibmap:"+repr(bibmap))
	logging.debug("documentViewer (getbibinfofromindexmeta) bibtype:"+repr(bibtype))
# if there is no mapping bibmap is empty (mapping sometimes has empty fields)	# if there is no mapping bibmap is empty (mapping sometimes has empty fields)
if len(bibmap) > 0 and len(bibmap['author'][0]) > 0:	if len(bibmap) > 0 and len(bibmap['author'][0]) > 0:
try:	try:
Line 500 class documentViewer(Folder):	Line 552 class documentViewer(Folder):
try:	try:
docinfo['year']=getTextFromNode(dom.xpath("//bib/%s"%bibmap['year'][0])[0])	docinfo['year']=getTextFromNode(dom.xpath("//bib/%s"%bibmap['year'][0])[0])
except: pass	except: pass
#logging.debug("documentViewer (getbibinfofromindexmeta) using mapping for %s"%bibtype)	logging.debug("documentViewer (getbibinfofromindexmeta) using mapping for %s"%bibtype)
try:	try:
docinfo['lang']=getTextFromNode(dom.xpath("//bib/lang")[0])	docinfo['lang']=getTextFromNode(dom.xpath("//bib/lang")[0])
except:	except:
Line 509 class documentViewer(Folder):	Line 561 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['name']=getTextFromNode(dom.xpath("/resource/name")[0])
	logging.debug("documentViewer docinfo[name] %s"%docinfo['name'])
	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))
if docinfo is None:	if docinfo is None:
docinfo = {}	docinfo = {}
if docinfo.get('lang', None) is None:	if docinfo.get('lang', None) is None:
docinfo['lang'] = '' # default keine Sprache gesetzt	docinfo['lang'] = '' # default keine Sprache gesetzt
if dom is None:	if dom is None:
dom = self.getIndexMeta(url)	dom = self.getDomFromIndexMeta(url)

archivePath = None	archivePath = None
archiveName = None	archiveName = None
Line 538 class documentViewer(Folder):	Line 604 class documentViewer(Folder):
archivePath += "/" + archiveName	archivePath += "/" + archiveName
else:	else:
# try to get archive-path from url	# try to get archive-path from url
#logging.warning("documentViewer (getdocinfofromtexttool) resource/archive-path missing in: %s" % (url))	logging.warning("documentViewer (getdocinfofromtexttool) resource/archive-path missing in: %s" % (url))
if (not url.startswith('http')):	if (not url.startswith('http')):
archivePath = url.replace('index.meta', '')	archivePath = url.replace('index.meta', '')

Line 591 class documentViewer(Folder):	Line 657 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)
	#docinfo =self.getOrigPages(docinfo=docinfo)

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
Line 632 class documentViewer(Folder):	Line 700 class documentViewer(Folder):

def getDocinfoFromImagePath(self,path,docinfo=None,cut=0):	def getDocinfoFromImagePath(self,path,docinfo=None,cut=0):
"""path ist the path to the images it assumes that the index.meta file is one level higher."""	"""path ist the path to the images it assumes that the index.meta file is one level higher."""
#logging.debug("documentViewer (getdocinfofromimagepath) path: %s"%(path))	logging.debug("documentViewer (getdocinfofromimagepath) path: %s"%(path))
if docinfo is None:	if docinfo is None:
docinfo = {}	docinfo = {}
path=path.replace("/mpiwg/online","")	path=path.replace("/mpiwg/online","")
Line 642 class documentViewer(Folder):	Line 710 class documentViewer(Folder):
pathorig=path	pathorig=path
for x in range(cut):	for x in range(cut):
path=getParentDir(path)	path=getParentDir(path)
#logging.debug("documentViewer (getdocinfofromimagepath) PATH:"+path)	logging.debug("documentViewer (getdocinfofromimagepath) PATH:"+path)
imageUrl=self.digilibBaseUrl+"/servlet/Scaler?fn="+path	imageUrl=self.digilibBaseUrl+"/servlet/Scaler?fn="+path
docinfo['imageURL'] = imageUrl	docinfo['imageURL'] = imageUrl

Line 654 class documentViewer(Folder):	Line 722 class documentViewer(Folder):

def getDocinfo(self, mode, url):	def getDocinfo(self, mode, url):
"""returns docinfo depending on mode"""	"""returns docinfo depending on mode"""
#logging.debug("documentViewer (getdocinfo) mode: %s, url: %s"%(mode,url))	logging.debug("documentViewer (getdocinfo) mode: %s, url: %s"%(mode,url))
# look for cached docinfo in session	# look for cached docinfo in session
if self.REQUEST.SESSION.has_key('docinfo'):	if self.REQUEST.SESSION.has_key('docinfo'):
docinfo = self.REQUEST.SESSION['docinfo']	docinfo = self.REQUEST.SESSION['docinfo']
# check if its still current	# check if its still current
if docinfo is not None and docinfo.get('mode') == mode and docinfo.get('url') == url:	if docinfo is not None and docinfo.get('mode') == mode and docinfo.get('url') == url:
#logging.debug("documentViewer (getdocinfo) docinfo in session: %s"%docinfo)	logging.debug("documentViewer (getdocinfo) docinfo in session: %s"%docinfo)
return docinfo	return docinfo
# new docinfo	# new docinfo
docinfo = {'mode': mode, 'url': url}	docinfo = {'mode': mode, 'url': url}
Line 671 class documentViewer(Folder):	Line 739 class documentViewer(Folder):
elif mode=="filepath":	elif mode=="filepath":
docinfo = self.getDocinfoFromImagePath(url, docinfo=docinfo,cut=1)	docinfo = self.getDocinfoFromImagePath(url, docinfo=docinfo,cut=1)
else:	else:
#logging.error("documentViewer (getdocinfo) unknown mode: %s!"%mode)	logging.error("documentViewer (getdocinfo) unknown mode: %s!"%mode)
raise ValueError("Unknown mode %s! Has to be one of 'texttool','imagepath','filepath'."%(mode))	raise ValueError("Unknown mode %s! Has to be one of 'texttool','imagepath','filepath'."%(mode))

#logging.debug("documentViewer (getdocinfo) docinfo: %s"%docinfo)	logging.debug("documentViewer (getdocinfo) docinfo: %s"%docinfo)
	#logging.debug("documentViewer (getdocinfo) docinfo: %s"%)
self.REQUEST.SESSION['docinfo'] = docinfo	self.REQUEST.SESSION['docinfo'] = docinfo
return docinfo	return docinfo

def getPageinfo(self, current, start=None, rows=None, cols=None, docinfo=None, viewMode=None, tocMode=None):	def getPageinfo(self, current, start=None, rows=None, cols=None, docinfo=None, viewMode=None, tocMode=None,characterNormalization=""):
"""returns pageinfo with the given parameters"""	"""returns pageinfo with the given parameters"""
pageinfo = {}	pageinfo = {}
current = getInt(current)	current = getInt(current)

pageinfo['current'] = current	pageinfo['current'] = current
rows = int(rows or self.thumbrows)	rows = int(rows or self.thumbrows)
pageinfo['rows'] = rows	pageinfo['rows'] = rows
Line 701 class documentViewer(Folder):	Line 771 class documentViewer(Folder):
pageinfo['numgroups'] += 1	pageinfo['numgroups'] += 1
pageinfo['viewMode'] = viewMode	pageinfo['viewMode'] = viewMode
pageinfo['tocMode'] = tocMode	pageinfo['tocMode'] = tocMode
	#pageinfo ['originalPage'] = self.getOrigPages(docinfo=None, pageinfo=None)
pageinfo['characterNormalization'] = self.REQUEST.get('characterNormalization','')	pageinfo['characterNormalization'] = self.REQUEST.get('characterNormalization','')
pageinfo['query'] = self.REQUEST.get('query',' ')	pageinfo['query'] = self.REQUEST.get('query',' ')
pageinfo['queryType'] = self.REQUEST.get('queryType',' ')	pageinfo['queryType'] = self.REQUEST.get('queryType',' ')
Line 713 class documentViewer(Folder):	Line 784 class documentViewer(Folder):
toc = int (pageinfo['tocPN'])	toc = int (pageinfo['tocPN'])
pageinfo['textPages'] =int (toc)	pageinfo['textPages'] =int (toc)



if 'tocSize_%s'%tocMode in docinfo:	if 'tocSize_%s'%tocMode in docinfo:
tocSize = int(docinfo['tocSize_%s'%tocMode])	tocSize = int(docinfo['tocSize_%s'%tocMode])
tocPageSize = int(pageinfo['tocPageSize'])	tocPageSize = int(pageinfo['tocPageSize'])
Line 767 def manage_addDocumentViewerTemplate(sel	Line 840 def manage_addDocumentViewerTemplate(sel
self._setObject(id, DocumentViewerTemplate(id))	self._setObject(id, DocumentViewerTemplate(id))
ob = getattr(self, id)	ob = getattr(self, id)
txt=file(os.path.join(package_home(globals()),'zpt/viewer_main.zpt'),'r').read()	txt=file(os.path.join(package_home(globals()),'zpt/viewer_main.zpt'),'r').read()
#logging.info("txt %s:"%txt)	logging.info("txt %s:"%txt)
ob.pt_edit(txt,"text/html")	ob.pt_edit(txt,"text/html")
if title:	if title:
ob.pt_setTitle(title)	ob.pt_setTitle(title)

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

Removed from v.1.94
changed lines
	Added in v.1.146