Changeset 541:c4cc01b104d7 in documentViewer

Timestamp:

Aug 20, 2012, 6:13:56 PM (12 years ago)

Author:

casties

Branch:

default

Message:

better metadata display for index page.

Files:

• documentViewer.py (modified) (4 diffs)
• zpt/viewer_index.zpt (modified) (2 diffs)

documentViewer.py

@@ -18 +18 @@
 import string
 import json
+
+from Products.MetaDataProvider import MetaDataFolder
 
 from SrvTxtUtils import getInt, utf8ify, getText, getHttpData, refreshingImageFileIndexHtml
@@ -554 +556 @@
             bib = self.metadataService.getBibData(dom=metaDom)
             if bib:
-                docinfo = self.getDocinfoFromBib(docinfo, bib)
+                # save extended version as 'bibx'
+                bibx = self.metadataService.getBibData(dom=metaDom, all=True, recursive=1)
+                if len(bibx) == 1:
+                    # unwrap list if possible
+                    bibx = bibx[0]
+                    
+                docinfo['bibx'] = bibx
+                docinfo = self.getDocinfoFromBib(docinfo, bib, bibx)
             else:
                 # no bib - try info.xml
@@ -668 +677 @@
         docinfo['oddPage'] = texttool.get('odd-scan-position', 'left')
             
-        # number of title page (0: not defined)
-        docinfo['titlePage'] = texttool.get('title-scan-no', 0)
+        # number of title page (default 1)
+        docinfo['titlePage'] = texttool.get('title-scan-no', 1)
             
         # old presentation stuff
@@ -681 +690 @@
         return docinfo
 
-    def getDocinfoFromBib(self, docinfo, bib):
+    def getDocinfoFromBib(self, docinfo, bib, bibx=None):
         """reads contents of bib element into docinfo"""
         logging.debug("getDocinfoFromBib bib=%s"%repr(bib))

zpt/viewer_index.zpt

@@ -33 +33 @@
         <h2>Bibliographical information</h2>
         <table border="0"
-          tal:define="formattedData python:here.metadata.getBibFormattedMetaDataExtended(bibdata=docinfo.get('bib', None))">
+          tal:define="formattedData python:here.metadata.getBibFormattedMetaDataExtended(bibdata=docinfo.get('bib', None),bibxdata=docinfo.get('bibx', None))">
           <tal:x condition="python:formattedData">
             <!-- wenn es bibinfo in docinfo gibt -->
@@ -100 +100 @@
             <tr>
               <td class="type">License:</td>
-              <td class="content"><a href="http://creativecommons.org/licenses/by-sa/3.0/de/">CC-BY-SA</a></td>
+              <td class="content"><a href="http://creativecommons.org/licenses/by-sa/3.0/de/">CC-BY-SA</a> (unless otherwise stated)</td>
             </tr>
           </table>