--- documentViewer/documentViewer.py 2011/08/23 13:05:11 1.175.2.30 +++ documentViewer/documentViewer.py 2011/08/29 14:39:50 1.175.2.33 @@ -2,17 +2,13 @@ from OFS.Folder import Folder from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate from Products.PageTemplates.PageTemplateFile import PageTemplateFile from App.ImageFile import ImageFile -#from Products.ZSimpleFile.ZSimpleFile import ZSimpleFile 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 ## @@ -139,8 +129,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 = ImageFile('css/docuviewer.css',globals()) + # make ImageFile better for development + docuviewer_css.index_html = refreshingImageFileIndexHtml thumbs_main_rss = PageTemplateFile('zpt/thumbs_main_rss', globals())