diff documentViewer.py @ 490:6f116b86a226 elementtree

more new template stuff. moved ImageFile index method to SrvTxtUtils
author casties
date Mon, 29 Aug 2011 16:39:50 +0200
parents 55e3398e395e
children fe319aa0ba30
line wrap: on
line diff
--- a/documentViewer.py	Thu Aug 25 17:05:22 2011 +0200
+++ b/documentViewer.py	Mon Aug 29 16:39:50 2011 +0200
@@ -2,8 +2,6 @@
 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 @@
 import xml.etree.ElementTree as ET
 
 import os
-import stat
 import sys
 import urllib
 import logging
@@ -20,12 +17,7 @@
 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 @@
     # 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 @@
     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())