--- documentViewer/documentViewer.py 2011/07/29 18:36:04 1.175.2.12 +++ documentViewer/documentViewer.py 2011/08/02 10:35:05 1.175.2.14 @@ -464,6 +464,7 @@ class documentViewer(Folder): # process index.meta contents if metaDom is not None: # document directory name and path + logging.debug("RESOURCE: %s"%repr(self.metadataService.resource.getData(dom=metaDom,recursive=1))) resource = self.metadataService.getResourceData(dom=metaDom) if resource: docinfo = self.getDocinfoFromResource(docinfo, resource) @@ -486,6 +487,20 @@ class documentViewer(Folder): if access: docinfo = self.getDocinfoFromAccess(docinfo, access) + # attribution info + attribution = self.metadataService.getAttributionData(dom=metaDom) + if attribution: + logging.debug("getDocinfo: attribution=%s"%repr(attribution)) + docinfo['attribution'] = attribution + #docinfo = self.getDocinfoFromAccess(docinfo, access) + + # copyright info + copyright = self.metadataService.getCopyrightData(dom=metaDom) + if copyright: + logging.debug("getDocinfo: copyright=%s"%repr(copyright)) + docinfo['copyright'] = copyright + #docinfo = self.getDocinfoFromAccess(docinfo, access) + # image path if mode != 'texttool': # override image path from texttool