--- documentViewer/documentViewer.py 2011/08/22 15:00:28 1.175.2.29 +++ documentViewer/documentViewer.py 2011/08/31 16:22:12 1.175.2.34 @@ -1,18 +1,14 @@ from OFS.Folder import Folder -from OFS.Image import File from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate from Products.PageTemplates.PageTemplateFile import PageTemplateFile -from Products.ZSimpleFile import ZSimpleFile +from App.ImageFile import ImageFile from AccessControl import ClassSecurityInfo from AccessControl import getSecurityManager from Globals import package_home -#from Ft.Xml import EMPTY_NAMESPACE, Parse -#import Ft.Xml.Domlette - import xml.etree.ElementTree as ET -import os.path +import os import sys import urllib import logging @@ -21,12 +17,7 @@ import urlparse import re import string -from SrvTxtUtils import getInt, getText, getHttpData - -def logger(txt,method,txt2): - """logging""" - logging.info(txt+ txt2) - +from SrvTxtUtils import getInt, getText, getHttpData, refreshingImageFileIndexHtml def serializeNode(node, encoding="utf-8"): """returns a string containing node as XML""" @@ -107,7 +98,6 @@ def getParentPath(path, cnt=1): # split by /, shorten, and reassemble return '/'.join(path.split('/')[0:-cnt]) - ## ## documentViewer class ## @@ -130,6 +120,7 @@ class documentViewer(Folder): toc_thumbs = PageTemplateFile('zpt/toc_thumbs', globals()) toc_text = PageTemplateFile('zpt/toc_text', 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_double = PageTemplateFile('zpt/page_main_double', globals()) page_main_text = PageTemplateFile('zpt/page_main_text', globals()) @@ -139,8 +130,9 @@ class documentViewer(Folder): page_main_pureXml = PageTemplateFile('zpt/page_main_pureXml', globals()) head_main = PageTemplateFile('zpt/head_main', globals()) info_xml = PageTemplateFile('zpt/info_xml', globals()) - # TODO: can this be nicer? - docuviewer_css = ZSimpleFile(content_type='text/css',filename='css/docuviewer.css', id='docuviewer_css',_prefix=globals()) + docuviewer_css = ImageFile('css/docuviewer.css',globals()) + # make ImageFile better for development + docuviewer_css.index_html = refreshingImageFileIndexHtml thumbs_main_rss = PageTemplateFile('zpt/thumbs_main_rss', globals())