--- documentViewer/documentViewer.py 2011/08/25 15:05:22 1.175.2.32 +++ documentViewer/documentViewer.py 2011/08/29 14:39:50 1.175.2.33 @@ -2,8 +2,6 @@ from OFS.Folder import Folder from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate from Products.PageTemplates.PageTemplateFile import PageTemplateFile 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 @@ -11,7 +9,6 @@ from Globals import package_home import xml.etree.ElementTree as ET import os -import stat import sys import urllib import logging @@ -20,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""" @@ -106,15 +98,6 @@ 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 ## @@ -148,7 +131,7 @@ class documentViewer(Folder): info_xml = PageTemplateFile('zpt/info_xml', globals()) docuviewer_css = ImageFile('css/docuviewer.css',globals()) # make ImageFile better for development - docuviewer_css.index_html = devImageFileIndexHtml + docuviewer_css.index_html = refreshingImageFileIndexHtml thumbs_main_rss = PageTemplateFile('zpt/thumbs_main_rss', globals())