--- ECHO_content/ECHO_helpers.py 2005/01/19 19:38:55 1.34 +++ ECHO_content/ECHO_helpers.py 2005/02/07 12:25:54 1.39 @@ -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: @@ -383,12 +388,20 @@ def checkOnlyOneInGroup(object): return displayedObjects[0][1] else: return object -def getSubCols(self, sortfield="weight", subColTypes=displayTypes, sortFieldMD=None): +def getSubCols(self, sortfield=None, subColTypes=displayTypes, sortFieldMD=None): + def sort(x,y): + return cmp(x[0],y[0]) + def sortfnc(sortfield,x,y): - xa=x[1].getMDValue(sortfield) - ya=y[1].getMDValue(sortfield) - print xa,ya + try: + xa=x[1].getMDValue(sortfield) + except: + xa="" + try: + ya=y[1].getMDValue(sortfield) + except: + ya="" return cmp(xa,ya) sortWithMD = lambda sortfield : (lambda x,y : sortfnc(sortfield,x,y)) @@ -401,29 +414,29 @@ def getSubCols(self, sortfield="weight", object=entry[1] ids.append(object) - try: - sortfield=self.sortfield - except: - """nothing""" + if not sortfield: + sortfield=getattr(self,'sortfield','weight') + 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() + tmplist.sort(sort) else: tmplist.sort(sortWithMD(sortFieldMD)) - + return [x for (key,x) in tmplist] def ECHO_rerenderLinksMD(self,obj=None,types=['title','label']): @@ -460,8 +473,6 @@ def reloadMetaDataFromStorage(self,RESPO for resource in resources: x=str(resource[1].copyIndex_meta2echo_resource())+"
" ret+=x - #print x - if RESPONSE is not None: #RESPONSE.redirect('./manage_main') @@ -659,7 +670,7 @@ def writeMetadata(url,metadict,project=N """Einlesen der Metadaten und und erstellen des geaenderten XML file""" def updateTextToolNode(tag,value): - #print dom,tag,value + metanode=dom.getElementsByTagName('texttool')[0] try: nodeOld=metanode.getElementsByTagName(tag)