X-Git-Url: https://svn.cri.ensmp.fr/git/Photo.git/blobdiff_plain/a18ca54d896fa2f98cf2b7fb8955120ff5e0aa37..2a45d522de56e0a031c6ee829eb1ed38764d7819:/metadata.py?ds=sidebyside diff --git a/metadata.py b/metadata.py index 96a44aa..156df58 100755 --- a/metadata.py +++ b/metadata.py @@ -19,11 +19,12 @@ ####################################################################################### """ Photo metadata read / write module -$Id: metadata.py 1272 2009-08-11 08:57:35Z pin $ -$URL: http://svn.luxia.fr/svn/labo/projects/zope/Photo/trunk/metadata.py $ + + """ from AccessControl import ClassSecurityInfo +from Acquisition import aq_base from Globals import InitializeClass from AccessControl.Permissions import view from ZODB.interfaces import BlobError @@ -136,9 +137,10 @@ class Metadata : node = index.get(path) if node : - firstLi = node['rdf:Alt/rdf:li'] - assert firstLi.unique, "More than one rdf:Alt (localisation not yet supported)" - return firstLi.element.content + firstLi = node.get('rdf:Alt/rdf:li') + if firstLi : + assert firstLi.unique, "More than one rdf:Alt (localisation not yet supported)" + return firstLi.element.content return '' security.declarePrivate('getXmpProp') @@ -168,7 +170,7 @@ class Metadata : root = info['root'] rdfType = info['rdfType'].capitalize() methName = 'getXmp%s' % rdfType - meth = getattr(self.aq_base, methName) + meth = getattr(aq_base(self), methName) return meth(name, root)