--- ECHO_content/ECHO_collection.py 2007/01/23 16:50:11 1.281 +++ ECHO_content/ECHO_collection.py 2007/01/23 18:53:01 1.282 @@ -1300,9 +1300,9 @@ class ECHO_resource(CatalogAware,Folder, """returns value for simple search""" try: - return " ".join([self.getMDValue('title',generic="yes"), - self.getMDValue('author',generic="yes"), - self.getMDValue('year',generic="yes"),self.getTitle()]) + return " ".join([self.getMDValue('title',generic="yes",empty=" "), + self.getMDValue('author',generic="yes",empty=" "), + self.getMDValue('year',generic="yes",empty=" "),self.getTitle()]) except: #zLOG.LOG(" ECHO_collection(getMDSimpleSearchField)",zLOG.INFO," ".join([self.getMDValue('title',generic="yes"), @@ -1342,7 +1342,7 @@ class ECHO_resource(CatalogAware,Folder, self._v_mapHash[ct][fieldNameTest]=fieldName if not fieldName: fieldName=fieldNameTest - if not empty: + if empty is None: #FIXME: warum gibt es manchmal kein metadatahas try: @@ -1352,10 +1352,13 @@ class ECHO_resource(CatalogAware,Folder, return "" else: - + try: ret= self.metaDataHash.get(fieldNameTest,empty) - + except: + zLOG.LOG("ECHO (line 1069)",zLOG.ERROR,"no md hash for %s"%self.getId()) + return "" + if type(ret) is StringType: return ret.decode('utf-8') else: