Diff for /ECHO_content/ECHO_collection.py between versions 1.300 and 1.301

version 1.300, 2008/12/10 13:37:03 version 1.301, 2008/12/17 12:12:26
Line 40  from Globals import Persistent, package_ Line 40  from Globals import Persistent, package_
 from Acquisition import Implicit  from Acquisition import Implicit
 from Products.ZCatalog.CatalogPathAwareness import CatalogAware  from Products.ZCatalog.CatalogPathAwareness import CatalogAware
 from Products.ZCTextIndex.ZCTextIndex import manage_addLexicon  from Products.ZCTextIndex.ZCTextIndex import manage_addLexicon
   try:
 from Products.MetaDataProvider.MetaDataClient import MetaDataClient  from Products.MetaDataProvider.MetaDataClient import MetaDataClient
   except:
       print "no metadataclient"
 import urllib  import urllib
 import urllib2  import urllib2
 import cgi  import cgi
Line 2194  class ECHO_root(Folder,Persistent,Implic Line 2197  class ECHO_root(Folder,Persistent,Implic
             """ret attribute if existing"""              """ret attribute if existing"""
             try:              try:
                                           
                     return getattr(found,field)#.decode('utf-8','ignore')  
                       return getattr(found,field)#.decode('ascii','ignore')
   
   
   
             except:              except:
                     logging.error("can't: decode: %s"%repr(field))                      logging.error("can't: decode: %s"%repr(field))
                     logging.error("      %s %s"%(sys.exc_info()[0],sys.exc_info()[1]))                      logging.error("      %s %s"%(sys.exc_info()[0],sys.exc_info()[1]))

Removed from v.1.300  
changed lines
  Added in v.1.301


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