# HG changeset patch # User casties # Date 1312302555 -7200 # Node ID dc7c48912110c310e53babd5aa5da3b9368da19a # Parent 8b75d55582e8bb936a89b87f1a2b73efb76e92f8 attribution and copyright works mostly now diff -r 8b75d55582e8 -r dc7c48912110 documentViewer.py --- a/documentViewer.py Tue Aug 02 12:35:05 2011 +0200 +++ b/documentViewer.py Tue Aug 02 18:29:15 2011 +0200 @@ -464,7 +464,7 @@ # 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))) + logging.debug("RESOURCE: %s"%repr(self.metadataService.resource.meta.getData(dom=metaDom, all=True, recursive=2))) resource = self.metadataService.getResourceData(dom=metaDom) if resource: docinfo = self.getDocinfoFromResource(docinfo, resource) @@ -565,9 +565,15 @@ textUrl = texttool.get('text-url-path', None) if textUrl: docinfo['textURLPath'] = textUrl - #TODO: ugly: - #textUrlkurz = string.split(textUrl, ".")[0] - #docinfo['textURLPathkurz'] = textUrlkurz + + # page flow + docinfo['pageFlow'] = texttool.get('page-flow', 'ltr') + + # odd pages are left + docinfo['oddPage'] = texttool.get('odd-scan-orientation', 'left') + + # number of title page + docinfo['titlePage'] = texttool.get('title-scan-no', 0) # old presentation stuff presentation = texttool.get('presentation', None) @@ -577,6 +583,7 @@ else: docinfo['presentationUrl'] = os.path.join(docPath, presentation) + return docinfo def getDocinfoFromBib(self, docinfo, bib):