Diff for /ECHO_content/ECHO_helpers.py between versions 1.6 and 1.17

version 1.6, 2004/05/06 10:27:07 version 1.17, 2004/08/19 20:28:18
Line 1 Line 1
 displayTypes = ['ZSQLExtendFolder','ZSQLBibliography','ECHO_group','ECHO_collection','ECHO_resource','ECHO_link']  import socket
   import urllib
       
   def urlopen(url):
       """urlopen mit timeout"""
       socket.setdefaulttimeout(2)
       return urllib.urlopen(url)
   #   urlopener = urllib.URLopener()
   #
   #   try:        
   #       con = urlopener.open(url)
   #       return con
   #   except timeoutsocket.Timeout:
   #       return None
   
   
   displayTypes = ['ZSQLExtendFolder','ZSQLBibliography','ECHO_group','ECHO_collection','ECHO_resource','ECHO_link','ECHO_sqlElement','ECHO_pageTemplate','ImageCollectionIFrame','VLP_resource','VLP_collection','VLP_essay','ECHO_ZCatalogElement']
   
   
 def checkOnlyOneInGroup(object):  def checkOnlyOneInGroup(object):
     """check if object is a group and if it containt only one element it return this element"""      """check if object is a group and if it containt only one element it return this element"""
     displayedObjects=object.ZopeFind(object,obj_metatypes=displayTypes)      displayedObjects=object.ZopeFind(object,obj_metatypes=displayTypes)
     if len(displayedObjects)==1: # nur ein Object dann redirect auf dieses Object      if len(displayedObjects)==1: # nur ein Object dann redirect auf dieses Object
   
         return displayedObjects[0][1]          return displayedObjects[0][1]
     else:      else:
         return object          return object
Line 32  def getSubCols(self,sortfield="weight",s Line 50  def getSubCols(self,sortfield="weight",s
         for x in ids:          for x in ids:
             if hasattr(x,sortfield):              if hasattr(x,sortfield):
                 try:                  try:
   
                     x=int(x)                      x=int(x)
                 except:                  except:
                     """nothing"""                      """nothing"""

Removed from v.1.6  
changed lines
  Added in v.1.17


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