--- documentViewer/documentViewer.py 2011/08/22 15:00:28 1.175.2.29 +++ documentViewer/documentViewer.py 2011/08/25 15:05:22 1.175.2.32 @@ -1,18 +1,17 @@ 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 App.Common import rfc1123_date +#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 stat import sys import urllib import logging @@ -107,6 +106,14 @@ def getParentPath(path, cnt=1): # split by /, shorten, and reassemble return '/'.join(path.split('/')[0:-cnt]) +def devImageFileIndexHtml(self, REQUEST, RESPONSE): + """index_html method for App.ImageFile that updates the file info for each request.""" + stat_info = os.stat(self.path) + self.size = stat_info[stat.ST_SIZE] + self.lmt = float(stat_info[stat.ST_MTIME]) or time.time() + self.lmh = rfc1123_date(self.lmt) + # call original method + return ImageFile.index_html(self, REQUEST, RESPONSE) ## ## documentViewer class @@ -139,8 +146,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 = devImageFileIndexHtml thumbs_main_rss = PageTemplateFile('zpt/thumbs_main_rss', globals())