version 1.245, 2005/10/28 17:49:45
|
version 1.246, 2005/11/03 14:45:28
|
Line 1062 class ECHO_resource(CatalogAware,Folder,
|
Line 1062 class ECHO_resource(CatalogAware,Folder,
|
self._v_mapHash[ct][fieldNameTest]=fieldName |
self._v_mapHash[ct][fieldNameTest]=fieldName |
|
|
if not empty: |
if not empty: |
|
#FIXME: warum gibt es manchmal kein metadatahash |
|
try: |
return self.metaDataHash.get(fieldName,'!!NOT USED HERE in Type: %s'%self.contentType) |
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: |
else: |
return self.metaDataHash.get(fieldName,empty) |
return self.metaDataHash.get(fieldName,empty) |
|
|
Line 1298 class ECHO_resource(CatalogAware,Folder,
|
Line 1302 class ECHO_resource(CatalogAware,Folder,
|
|
|
return "OK:",self.absolute_url().self,contentType |
return "OK:",self.absolute_url().self,contentType |
|
|
def ECHO_getResourceMD(self,template="yes",back=None): |
def ECHO_getResourceMD(self,template="yes",back=None,overwrite="no"): |
"""Einlesen der Metadaten und Anlegen dieser Metadaten als Informationen zur Resource""" |
"""Einlesen der Metadaten und Anlegen dieser Metadaten als Informationen zur Resource""" |
(metadict, error)=readMetadata(self.metalink) |
(metadict, error)=readMetadata(self.metalink) |
|
|
Line 1308 class ECHO_resource(CatalogAware,Folder,
|
Line 1312 class ECHO_resource(CatalogAware,Folder,
|
if not error=="": #Fehler beim Auslesen des Metafiles |
if not error=="": #Fehler beim Auslesen des Metafiles |
return "ERROR:",error |
return "ERROR:",error |
|
|
if not self.contentType: |
if (not self.contentType) or (overwrite=="yes"): |
self.contentType=metadict['bib_type'].lower() |
self.contentType=metadict['bib_type'] |
|
|
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'] |