documentViewer/documentViewer.py - diff

Return to documentViewer.py CVS log

Up to [Repository] / documentViewer

Diff for /documentViewer/documentViewer.py between versions 1.175.2.29 and 1.175.2.34

version 1.175.2.29, 2011/08/22 15:00:28	version 1.175.2.34, 2011/08/31 16:22:12
Line 1	Line 1
from OFS.Folder import Folder	from OFS.Folder import Folder
from OFS.Image import File
from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate	from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate
from Products.PageTemplates.PageTemplateFile import PageTemplateFile	from Products.PageTemplates.PageTemplateFile import PageTemplateFile
from Products.ZSimpleFile import ZSimpleFile	from App.ImageFile import ImageFile
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 Ft.Xml import EMPTY_NAMESPACE, Parse
#import Ft.Xml.Domlette

import xml.etree.ElementTree as ET	import xml.etree.ElementTree as ET

import os.path	import os
import sys	import sys
import urllib	import urllib
import logging	import logging
Line 21 import urlparse	Line 17 import urlparse
import re	import re
import string	import string

from SrvTxtUtils import getInt, getText, getHttpData	from SrvTxtUtils import getInt, getText, getHttpData, refreshingImageFileIndexHtml

def logger(txt,method,txt2):
"""logging"""
logging.info(txt+ txt2)


def serializeNode(node, encoding="utf-8"):	def serializeNode(node, encoding="utf-8"):
"""returns a string containing node as XML"""	"""returns a string containing node as XML"""
Line 107 def getParentPath(path, cnt=1):	Line 98 def getParentPath(path, cnt=1):
# split by /, shorten, and reassemble	# split by /, shorten, and reassemble
return '/'.join(path.split('/')[0:-cnt])	return '/'.join(path.split('/')[0:-cnt])


##	##
## documentViewer class	## documentViewer class
##	##
Line 130 class documentViewer(Folder):	Line 120 class documentViewer(Folder):
toc_thumbs = PageTemplateFile('zpt/toc_thumbs', globals())	toc_thumbs = PageTemplateFile('zpt/toc_thumbs', globals())
toc_text = PageTemplateFile('zpt/toc_text', globals())	toc_text = PageTemplateFile('zpt/toc_text', globals())
toc_figures = PageTemplateFile('zpt/toc_figures', globals())	toc_figures = PageTemplateFile('zpt/toc_figures', globals())
	toc_none = PageTemplateFile('zpt/toc_none', globals())
page_main_images = PageTemplateFile('zpt/page_main_images', globals())	page_main_images = PageTemplateFile('zpt/page_main_images', globals())
page_main_double = PageTemplateFile('zpt/page_main_double', globals())	page_main_double = PageTemplateFile('zpt/page_main_double', globals())
page_main_text = PageTemplateFile('zpt/page_main_text', globals())	page_main_text = PageTemplateFile('zpt/page_main_text', globals())
Line 139 class documentViewer(Folder):	Line 130 class documentViewer(Folder):
page_main_pureXml = PageTemplateFile('zpt/page_main_pureXml', globals())	page_main_pureXml = PageTemplateFile('zpt/page_main_pureXml', globals())
head_main = PageTemplateFile('zpt/head_main', globals())	head_main = PageTemplateFile('zpt/head_main', globals())
info_xml = PageTemplateFile('zpt/info_xml', globals())	info_xml = PageTemplateFile('zpt/info_xml', globals())
# TODO: can this be nicer?	docuviewer_css = ImageFile('css/docuviewer.css',globals())
docuviewer_css = ZSimpleFile(content_type='text/css',filename='css/docuviewer.css', id='docuviewer_css',_prefix=globals())	# make ImageFile better for development
	docuviewer_css.index_html = refreshingImageFileIndexHtml


thumbs_main_rss = PageTemplateFile('zpt/thumbs_main_rss', globals())	thumbs_main_rss = PageTemplateFile('zpt/thumbs_main_rss', globals())

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

Removed from v.1.175.2.29
changed lines
	Added in v.1.175.2.34