--- ECHO_content/ECHO_helpers.py 2005/01/31 11:15:50 1.37 +++ ECHO_content/ECHO_helpers.py 2005/02/07 12:25:54 1.39 @@ -388,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)) @@ -406,10 +414,9 @@ 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=[] @@ -426,7 +433,7 @@ def getSubCols(self, sortfield="weight", tmplist.append((tmp,x)) if not sortFieldMD: - tmplist.sort() + tmplist.sort(sort) else: tmplist.sort(sortWithMD(sortFieldMD)) @@ -466,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') @@ -665,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)