[BACK]Return to documentViewer.py CVS log [TXT] [DIR] Up to [Repository] / documentViewer

Diff for /documentViewer/documentViewer.py between versions 1.175.2.32 and 1.175.2.33

version 1.175.2.32, 2011/08/25 15:05:22 version 1.175.2.33, 2011/08/29 14:39:50
Line 2  from OFS.Folder import Folder Line 2  from OFS.Folder import Folder
 from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate  from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile  from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from App.ImageFile import ImageFile  from App.ImageFile import ImageFile
 from App.Common import rfc1123_date  
 #from Products.ZSimpleFile.ZSimpleFile import ZSimpleFile  
 from AccessControl import ClassSecurityInfo  from AccessControl import ClassSecurityInfo
 from AccessControl import getSecurityManager  from AccessControl import getSecurityManager
 from Globals import package_home  from Globals import package_home
Line 11  from Globals import package_home Line 9  from Globals import package_home
 import xml.etree.ElementTree as ET  import xml.etree.ElementTree as ET
   
 import os  import os
 import stat  
 import sys  import sys
 import urllib  import urllib
 import logging  import logging
Line 20  import urlparse Line 17  import urlparse
 import re  import re
 import string  import string
   
 from SrvTxtUtils import getInt, getText, getHttpData  from SrvTxtUtils import getInt, getText, getHttpData, refreshingImageFileIndexHtml
   
 def logger(txt,method,txt2):  
     """logging"""  
     logging.info(txt+ txt2)  
       
           
 def serializeNode(node, encoding="utf-8"):  def serializeNode(node, encoding="utf-8"):
     """returns a string containing node as XML"""      """returns a string containing node as XML"""
Line 106  def getParentPath(path, cnt=1): Line 98  def getParentPath(path, cnt=1):
     # split by /, shorten, and reassemble      # split by /, shorten, and reassemble
     return '/'.join(path.split('/')[0:-cnt])      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  ## documentViewer class
 ##  ##
Line 148  class documentViewer(Folder): Line 131  class documentViewer(Folder):
     info_xml = PageTemplateFile('zpt/info_xml', globals())      info_xml = PageTemplateFile('zpt/info_xml', globals())
     docuviewer_css = ImageFile('css/docuviewer.css',globals())      docuviewer_css = ImageFile('css/docuviewer.css',globals())
     # make ImageFile better for development      # make ImageFile better for development
     docuviewer_css.index_html = devImageFileIndexHtml      docuviewer_css.index_html = refreshingImageFileIndexHtml
           
           
     thumbs_main_rss = PageTemplateFile('zpt/thumbs_main_rss', globals())      thumbs_main_rss = PageTemplateFile('zpt/thumbs_main_rss', globals())
Removed from v.1.175.2.32  
changed lines
  Added in v.1.175.2.33

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>