Diff for /ECHO_content/ECHO_collection.py between versions 1.295 and 1.296

version 1.295, 2008/11/07 14:51:54 version 1.296, 2008/11/16 12:15:42
Line 422  class ECHO_resource(CatalogAware,Folder, Line 422  class ECHO_resource(CatalogAware,Folder,
     default_catalog='resourceCatalog'      default_catalog='resourceCatalog'
           
 #    viewClassificationList=viewClassificationListMaster  #    viewClassificationList=viewClassificationListMaster
       def setPID(self,pid):
           """set the pid"""
           self.pid=pid
           return True
           
       def getPID(self):
           """get the pid"""
           return getattr(self,'pid',None)
   
     def PrincipiaSearchSource(self):      def PrincipiaSearchSource(self):
            """Return cataloguable key for ourselves."""             """Return cataloguable key for ourselves."""
Line 3531  class ECHO_root(Folder,Persistent,Implic Line 3539  class ECHO_root(Folder,Persistent,Implic
             """ret attribute if existing"""              """ret attribute if existing"""
             try:              try:
                                           
                     return getattr(found,field).decode('ascii','ignore')                      return getattr(found,field)#.decode('utf-8','ignore')
             except:              except:
                       logging.error("can't: decode: %s"%repr(field))
                       logging.error("      %s %s"%(sys.exc_info()[0],sys.exc_info()[1]))
                     return ""                      return ""
   
     security.declarePublic('getImageTag')      security.declarePublic('getImageTag')

Removed from v.1.295  
changed lines
  Added in v.1.296


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