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

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

version 1.33, 2005/01/18 15:40:03 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 583  def checkDiffs(self,metadict): Line 583  def checkDiffs(self,metadict):
 def zptFile(self, path, orphaned=False):  def zptFile(self, path, orphaned=False):
     """returns a page template file from the product"""      """returns a page template file from the product"""
     if orphaned:      if orphaned:
     # unusual case (only for macro templates)      # unusual case
     pt=PageTemplateFile(os.path.join(package_home(globals()), path))      pt=PageTemplateFile(os.path.join(package_home(globals()), path))
     else:      else:
     pt=PageTemplateFile(os.path.join(package_home(globals()), path)).__of__(self)      pt=PageTemplateFile(os.path.join(package_home(globals()), path)).__of__(self)
Line 591  def zptFile(self, path, orphaned=False): Line 591  def zptFile(self, path, orphaned=False):
   
   
 def findObjectPath(startobject, filename):  def findObjectPath(startobject, filename):
     """returns the object with the filename starting at startobject"""      """returns the object with the name filename starting at startobject"""
     if startobject is None:      if startobject is None:
     return None      return None
     paths = filename.split('/')      paths = filename.split('/')
Line 609  def zptObjectOrFile(self, filename, loca Line 609  def zptObjectOrFile(self, filename, loca
     """returns a page template instance or a file from the product"""      """returns a page template instance or a file from the product"""
     # look for an object called path      # look for an object called path
     pt = findObjectPath(self, filename)      pt = findObjectPath(self, filename)
     if pt is None:      # the object should also not be a python function
       if (pt is None) or isinstance(pt, types.FunctionType):
     # get a ZPT file      # get a ZPT file
     pt = zptFile(self, localdir+'/'+filename, orphaned=orphaned)      pt = zptFile(self, localdir+'/'+filename, orphaned=orphaned)
     return pt      return pt
Removed from v.1.33  
changed lines
  Added in v.1.34

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