version 1.248, 2005/11/03 15:58:16
|
version 1.250, 2005/11/04 18:03:20
|
Line 1040 class ECHO_resource(CatalogAware,Folder,
|
Line 1040 class ECHO_resource(CatalogAware,Folder,
|
|
|
|
|
|
|
def getMDValue(self,fieldName,empty=None,generic=None): |
def getMDValue(self,fieldNameTest,empty=None,generic=None): |
"""get md values""" |
"""get md values""" |
#TODO: cache mappinghash |
#TODO: cache mappinghash |
|
|
|
fieldName=None |
if generic: |
if generic: |
ct=self.contentType.replace(" ","_").lower() |
ct=self.contentType.replace(" ","_").lower() |
|
|
Line 1062 class ECHO_resource(CatalogAware,Folder,
|
Line 1062 class ECHO_resource(CatalogAware,Folder,
|
if not fieldName and hasattr(self.standardMD,ct): |
if not fieldName and hasattr(self.standardMD,ct): |
fieldName=getattr(self.standardMD,ct).generateMappingHash()[fieldNameTest][0] |
fieldName=getattr(self.standardMD,ct).generateMappingHash()[fieldNameTest][0] |
self._v_mapHash[ct][fieldNameTest]=fieldName |
self._v_mapHash[ct][fieldNameTest]=fieldName |
|
if not fieldName: |
|
fieldName=fieldNameTest |
if not empty: |
if not empty: |
#FIXME: warum gibt es manchmal kein metadatahas |
#FIXME: warum gibt es manchmal kein metadatahas |
try: |
try: |
Line 1070 class ECHO_resource(CatalogAware,Folder,
|
Line 1071 class ECHO_resource(CatalogAware,Folder,
|
except: |
except: |
zLOG.LOG("ECHO (line 1069)",zLOG.ERROR,"no md hash for %s"%self.getId()) |
zLOG.LOG("ECHO (line 1069)",zLOG.ERROR,"no md hash for %s"%self.getId()) |
return "" |
return "" |
|
|
else: |
else: |
return self.metaDataHash.get(fieldName,empty) |
|
|
return self.metaDataHash.get(fieldNameTest,empty) |
|
|
getFieldValue=getMDValue #depricated |
getFieldValue=getMDValue #depricated |
|
|
Line 1317 class ECHO_resource(CatalogAware,Folder,
|
Line 1320 class ECHO_resource(CatalogAware,Folder,
|
return "ERROR:",error |
return "ERROR:",error |
|
|
if (not self.contentType) or (overwrite=="yes"): |
if (not self.contentType) or (overwrite=="yes"): |
self.contentType=metadict['bib_type'] |
self.contentType=metadict['bib_type'].lower() |
|
|
if not (metadict['bib_type'].lower()==self.contentType.lower()): |
if not (metadict['bib_type'].lower()==self.contentType.lower()): |
self.REQUEST.SESSION['contentStorage']=metadict['bib_type'] |
self.REQUEST.SESSION['contentStorage']=metadict['bib_type'] |