[BACK]Return to documentViewer.py CVS log [TXT] [DIR] Up to [Repository] / documentViewer

Diff for /documentViewer/documentViewer.py between versions 1.175.2.12 and 1.175.2.15

version 1.175.2.12, 2011/07/29 18:36:04 version 1.175.2.15, 2011/08/02 16:29:15
Line 464  class documentViewer(Folder): Line 464  class documentViewer(Folder):
         # process index.meta contents          # process index.meta contents
         if metaDom is not None:          if metaDom is not None:
             # document directory name and path              # document directory name and path
               logging.debug("RESOURCE: %s"%repr(self.metadataService.resource.meta.getData(dom=metaDom, all=True, recursive=2)))
             resource = self.metadataService.getResourceData(dom=metaDom)              resource = self.metadataService.getResourceData(dom=metaDom)
             if resource:              if resource:
                 docinfo = self.getDocinfoFromResource(docinfo, resource)                  docinfo = self.getDocinfoFromResource(docinfo, resource)
Line 486  class documentViewer(Folder): Line 487  class documentViewer(Folder):
             if access:              if access:
                 docinfo = self.getDocinfoFromAccess(docinfo, 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          # image path
         if mode != 'texttool':          if mode != 'texttool':
             # override image path from texttool              # override image path from texttool
Line 550  class documentViewer(Folder): Line 565  class documentViewer(Folder):
         textUrl = texttool.get('text-url-path', None)          textUrl = texttool.get('text-url-path', None)
         if textUrl:          if textUrl:
             docinfo['textURLPath'] = textUrl              docinfo['textURLPath'] = textUrl
             #TODO: ugly:              
             #textUrlkurz = string.split(textUrl, ".")[0]          # page flow
             #docinfo['textURLPathkurz'] = textUrlkurz          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          # old presentation stuff
         presentation = texttool.get('presentation', None)          presentation = texttool.get('presentation', None)
Line 562  class documentViewer(Folder): Line 583  class documentViewer(Folder):
             else:              else:
                 docinfo['presentationUrl'] = os.path.join(docPath, presentation)                  docinfo['presentationUrl'] = os.path.join(docPath, presentation)
                           
           
         return docinfo          return docinfo
   
     def getDocinfoFromBib(self, docinfo, bib):      def getDocinfoFromBib(self, docinfo, bib):
Removed from v.1.175.2.12  
changed lines
  Added in v.1.175.2.15

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>