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

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

version 1.175.2.31, 2011/08/24 08:58:20 version 1.175.2.32, 2011/08/25 15:05:22
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 Products.ZSimpleFile.ZSimpleFile import ZSimpleFile
 from AccessControl import ClassSecurityInfo  from AccessControl import ClassSecurityInfo
 from AccessControl import getSecurityManager  from AccessControl import getSecurityManager
Line 9  from Globals import package_home Line 10  from Globals import package_home
   
 import xml.etree.ElementTree as ET  import xml.etree.ElementTree as ET
   
 import os.path  import os
   import stat
 import sys  import sys
 import urllib  import urllib
 import logging  import logging
Line 104  def getParentPath(path, cnt=1): Line 106  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 136  class documentViewer(Folder): Line 146  class documentViewer(Folder):
     page_main_pureXml = PageTemplateFile('zpt/page_main_pureXml', globals())      page_main_pureXml = PageTemplateFile('zpt/page_main_pureXml', globals())
     head_main = PageTemplateFile('zpt/head_main', globals())      head_main = PageTemplateFile('zpt/head_main', globals())
     info_xml = PageTemplateFile('zpt/info_xml', globals())      info_xml = PageTemplateFile('zpt/info_xml', globals())
     # TODO: can this be nicer?  
     docuviewer_css = ImageFile('css/docuviewer.css',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())      thumbs_main_rss = PageTemplateFile('zpt/thumbs_main_rss', globals())
Removed from v.1.175.2.31  
changed lines
  Added in v.1.175.2.32

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