--- ECHO_content/ECHO_helpers.py 2007/09/17 16:45:09 1.87 +++ ECHO_content/ECHO_helpers.py 2008/08/21 07:44:56 1.88 @@ -17,7 +17,7 @@ import ECHO_collection import base64 import bz2 import xmlrpclib - +import sys import logging #erstzt logging @@ -66,7 +66,7 @@ def content_html(self,type): # return templates[0][1]() if hasattr(self,type+"_template"): - logging.info("type: %s"%type) + obj=getattr(self,type+"_template") return obj() else: @@ -184,28 +184,28 @@ class ECHO_basis: return content_html(self,type) def getIsVisible(self): - """return if object and all parents are visible""" - - # if object is not visible return False - if hasattr(self,'isVisible'): - if not self.isVisible : return False - - # else if parent of object is not ECHO_root, ECHO_basis or None - if not self.aq_parent.meta_type in ['ECHO_root','ECHO_basis',None] : - return self.aq_parent.getIsVisible() + """return if object and all parents are visible""" + + # if object is not visible return False + if hasattr(self,'isVisible'): + if not self.isVisible : return False + + # else if parent of object is not ECHO_root, ECHO_basis or None + if not self.aq_parent.meta_type in ['ECHO_root','ECHO_basis',None] : + return self.aq_parent.getIsVisible() - # else return True - return True + # else return True + return True def setIsVisible(self, isVisible): - """ set object attribute isVisible""" - self.isVisible = isVisible + """ set object attribute isVisible""" + self.isVisible = isVisible def getAttributeIsVisible(self): - """ return object attribute isVisible""" - if hasattr(self,'isVisible'): - return self.isVisible - return True + """ return object attribute isVisible""" + if hasattr(self,'isVisible'): + return self.isVisible + return True def getTitle(self): """title""" @@ -628,8 +628,25 @@ def getSubCols(self, sortfield=None, isVisible=True): def sort(x,y): - return cmp(x[0],y[0]) - + try: + if type(x[0])==type(y[0]): + return cmp(x[0],y[0]) + else: + if type(x[0])==types.StringType: + tmpX=unicode(x[0]) + tmpY=y[0] + else: + tmpY=unicode(y[0]) + tmpX=x[0] + return cmp(tmpX,tmpY) + + except: + logging.error("Error at ECHO_helpers.sort:AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA") + logging.error(" : %s %s"%sys.exc_info()[0:2]) + logging.error("Error at ECHO_helpers.sort:"+repr(x)+"--"+repr(type(x[0]))) + logging.error("Error at ECHO_helpers.sort:"+repr(y)+"--"+repr(type(y[0]))) + logging.error("Error at ECHO_helpers.sort:BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB") + return 0 def sortfnc(sortfield,x,y): try: xa=x[1].getMDValue(sortfield,generic=generic)