--- ECHO_content/ECHO_collection.py 2005/11/03 14:45:28 1.246 +++ ECHO_content/ECHO_collection.py 2005/11/03 15:58:16 1.248 @@ -1037,12 +1037,14 @@ class ECHO_resource(CatalogAware,Folder, if RESPONSE is not None: RESPONSE.redirect('manage_main') + + - def getMDValue(self,fieldNameTest,empty=None,generic=None): + def getMDValue(self,fieldName,empty=None,generic=None): """get md values""" #TODO: cache mappinghash - fieldName=None + if generic: ct=self.contentType.replace(" ","_").lower() @@ -1060,16 +1062,18 @@ class ECHO_resource(CatalogAware,Folder, if not fieldName and hasattr(self.standardMD,ct): fieldName=getattr(self.standardMD,ct).generateMappingHash()[fieldNameTest][0] self._v_mapHash[ct][fieldNameTest]=fieldName - + if not empty: - #FIXME: warum gibt es manchmal kein metadatahash - try: - return self.metaDataHash.get(fieldName,'!!NOT USED HERE in Type: %s'%self.contentType) - except: - zLOG.LOG("ECHO (line 1069)",zLOG.ERROR,"no md hash for %s"%self.getId()) - return "" + #FIXME: warum gibt es manchmal kein metadatahas + try: + return self.metaDataHash.get(fieldName,'!!NOT USED HERE in Type: %s'%self.contentType) + except: + zLOG.LOG("ECHO (line 1069)",zLOG.ERROR,"no md hash for %s"%self.getId()) + return "" else: - return self.metaDataHash.get(fieldName,empty) + return self.metaDataHash.get(fieldName,empty) + + getFieldValue=getMDValue #depricated def newMetaXML(self,project=None,startpage=None,xslt=None,thumbtemplate=None,topbar=None,digiLibTemplate=None,digiliburlprefix=None): """new index.meta""" @@ -1300,7 +1304,7 @@ class ECHO_resource(CatalogAware,Folder, if RESPONSE: return RESPONSE.redirect('manage_main') - return "OK:",self.absolute_url().self,contentType + return "OK:",self.absolute_url(),self.contentType def ECHO_getResourceMD(self,template="yes",back=None,overwrite="no"): """Einlesen der Metadaten und Anlegen dieser Metadaten als Informationen zur Resource"""