--- ECHO_content/ECHO_helpers.py 2005/01/19 19:38:55 1.34 +++ ECHO_content/ECHO_helpers.py 2005/01/31 11:15:50 1.37 @@ -37,7 +37,9 @@ class ECHO_basis: """showrdf""" self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml') ret="""\n\n""" - ret+=self.getRDF(urn="echo:colllectionroot")+"\n" + + ret+=self.getRDF(urn="echo:collectionroot")+"\n" + ret+="""""" return ret @@ -95,6 +97,7 @@ class ECHO_basis: def getTitle(self): """title""" + return self.decode(self.title) try: return self.title.encode('utf-8','ignore') except: @@ -103,6 +106,8 @@ class ECHO_basis: def getLabel(self): """title""" + + return self.decode(self.label) try: return self.label.encode('utf-8','ignore') except: @@ -388,7 +393,7 @@ def getSubCols(self, sortfield="weight", def sortfnc(sortfield,x,y): xa=x[1].getMDValue(sortfield) ya=y[1].getMDValue(sortfield) - print xa,ya + #print xa,ya return cmp(xa,ya) sortWithMD = lambda sortfield : (lambda x,y : sortfnc(sortfield,x,y)) @@ -407,23 +412,24 @@ def getSubCols(self, sortfield="weight", """nothing""" tmplist=[] - for x in ids: - if hasattr(x,sortfield): - try: - x=int(x) - except: - """nothing""" - tmp=getattr(x,sortfield) - else: - tmp=10000000 - tmplist.append((tmp,x)) + for x in ids: + if hasattr(x,sortfield): + try: + tmp=int(getattr(x,sortfield)) + except: + tmp=getattr(x,sortfield) + + else: + tmp=10000000 + + tmplist.append((tmp,x)) if not sortFieldMD: tmplist.sort() else: tmplist.sort(sortWithMD(sortFieldMD)) - + return [x for (key,x) in tmplist] def ECHO_rerenderLinksMD(self,obj=None,types=['title','label']):