version 1.249, 2005/11/03 17:10:52
|
version 1.251, 2005/11/10 11:12:12
|
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 1308 class ECHO_resource(CatalogAware,Folder,
|
Line 1309 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 1318 class ECHO_resource(CatalogAware,Folder,
|
Line 1319 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'].lower() |
|
|
if not (metadict['bib_type'].lower()==self.contentType.lower()): |
if not (metadict['bib_type'].lower()==self.contentType.lower()): |
Line 1445 class ECHO_externalLink(Folder,ECHO_basi
|
Line 1446 class ECHO_externalLink(Folder,ECHO_basi
|
security.declarePublic('content_html') |
security.declarePublic('content_html') |
def content_html(self): |
def content_html(self): |
"""template fuer content""" |
"""template fuer content""" |
return ECHO_basis.content_html(self,'externalLink') |
ret= ECHO_basis.content_html(self,'externalLink') |
|
|
|
try: |
|
print "a" |
|
return ret.decode('utf-8') |
|
|
|
except: |
|
try: |
|
print "b" |
|
return ret.decode('latin-1') |
|
except: |
|
print "c" |
|
return ret |
|
|
def __init__(self,id,link,title,label,description,contentType,responsible,credits,weight,coords): |
def __init__(self,id,link,title,label,description,contentType,responsible,credits,weight,coords): |
|
|
Line 1518 class ECHO_link(ECHO_externalLink):
|
Line 1531 class ECHO_link(ECHO_externalLink):
|
"""external_link""" |
"""external_link""" |
|
|
meta_type="ECHO_link" |
meta_type="ECHO_link" |
|
|
manage_options = ECHO_externalLink.manage_options+( |
manage_options = ECHO_externalLink.manage_options+( |
{'label':'add links config','action':'ECHO_link_addLinksForm'}, |
{'label':'add links config','action':'ECHO_link_addLinksForm'}, |
) |
) |
Line 1537 class ECHO_link(ECHO_externalLink):
|
Line 1551 class ECHO_link(ECHO_externalLink):
|
def content_html(self): |
def content_html(self): |
"""template fuer link""" |
"""template fuer link""" |
|
|
|
|
if hasattr(self,"link_template"): |
if hasattr(self,"link_template"): |
ret=ECHO_basis.content_html(self,'link') |
ret=ECHO_basis.content_html(self,'link') |
|
|
else: |
else: |
ret=ECHO_basis.content_html(self,'collection') |
ret=ECHO_basis.content_html(self,'collection') |
|
|
try: |
|
return ret.decode('utf-8') |
#return ret |
except: |
|
return ret |
return ret |
|
# |
|
# |
|
# try: |
|
# return ret.decode('utf-8') |
|
# except: |
|
# try: |
|
# return ret.decode('latin-1') |
|
# except: |
|
# |
|
# return ret |
|
# |
|
|
|
|
def index_html(self): |
def index_html(self): |
"""standard link""" |
"""standard link""" |