Diff for /ECHO_content/ECHO_helpers.py between versions 1.32 and 1.34

version 1.32, 2004/12/10 19:33:09 version 1.34, 2005/01/19 19:38:55
Line 4  import socket Line 4  import socket
 import urllib  import urllib
 import string  import string
 import xml.dom.minidom  import xml.dom.minidom
 from types import *  import types
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile  from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from OFS.SimpleItem import SimpleItem  from OFS.SimpleItem import SimpleItem
 from Globals import package_home  from Globals import package_home
Line 310  class ECHO_basis: Line 310  class ECHO_basis:
   
 def toList(field):  def toList(field):
     """Einzelfeld in Liste umwandeln"""      """Einzelfeld in Liste umwandeln"""
     if type(field)==StringType:      if type(field)==types.StringType:
         return [field]          return [field]
     else:      else:
         return field          return field
Line 580  def checkDiffs(self,metadict): Line 580  def checkDiffs(self,metadict):
         return diffs          return diffs
           
   
 def zptFile(self, path):  def zptFile(self, path, orphaned=False):
     """returns a page template file from the product"""      """returns a page template file from the product"""
       if orphaned:
       # unusual case
       pt=PageTemplateFile(os.path.join(package_home(globals()), path))
       else:
     pt=PageTemplateFile(os.path.join(package_home(globals()), path)).__of__(self)      pt=PageTemplateFile(os.path.join(package_home(globals()), path)).__of__(self)
     return pt      return pt
   
   
 def sendFile(self, filename, type):  def findObjectPath(startobject, filename):
     """sends an object or a local file (in the product) as response"""      """returns the object with the name filename starting at startobject"""
       if startobject is None:
       return None
     paths = filename.split('/')      paths = filename.split('/')
     object = self      object = startobject
     # look for an object called filename  
     for path in paths:      for path in paths:
         if hasattr(object, path):          if hasattr(object, path):
         object = getattr(object, path)          object = getattr(object, path)
     else:      else:
         object = None          object = None
         break          break
       return object
   
   
   def zptObjectOrFile(self, filename, localdir='zpt', orphaned=False):
       """returns a page template instance or a file from the product"""
       # look for an object called path
       pt = findObjectPath(self, filename)
       # the object should also not be a python function
       if (pt is None) or isinstance(pt, types.FunctionType):
       # get a ZPT file
       pt = zptFile(self, localdir+'/'+filename, orphaned=orphaned)
       return pt
   
   
   def sendFile(self, filename, type):
       """sends an object or a local file (in the product) as response"""
       # look for an object called filename
       object = findObjectPath(self, filename)
     if object:      if object:
     # if the object exists then send it      # if the object exists then send it
     return object.index_html(self.REQUEST.REQUEST, self.REQUEST.RESPONSE)      return object.index_html(self.REQUEST.REQUEST, self.REQUEST.RESPONSE)

Removed from v.1.32  
changed lines
  Added in v.1.34


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