Changeset 608:0c6056271654 in documentViewer

Timestamp:

Dec 18, 2012, 6:26:22 PM (12 years ago)

Author:

casties

Branch:

default

Message:

show is-part-of relation in header.

Files:

• css/docuviewer.css (modified) (1 diff)
• documentViewer.py (modified) (5 diffs)
• zpt/viewer/common_template.zpt (modified) (1 diff)

css/docuviewer.css

@@ -41 +41 @@
         border: 1px solid silver;
     padding: 0.5em;  
+}
+div.page-head div.title.part-of {
+    border-top: none;
 }
 

documentViewer.py

@@ -554 +554 @@
         if metaDom is not None and metaDom.tag == 'resource':
             # document directory name and path
-            resource = self.metadataService.getResourceData(dom=metaDom)
+            resource = self.metadataService.getResourceData(dom=metaDom, recursive=1)
             if resource:
                 docinfo = self.getDocinfoFromResource(docinfo, resource)
@@ -643 +643 @@
         docinfo['maxPageNo'] = docinfo.get('maxPageNo', docinfo['numPages'])
 
+        # part-of information
+        partOfPath = docinfo.get('partOfPath', None)
+        if partOfPath is not None:
+            partOfDom = self.metadataService.getDomFromPathOrUrl(partOfPath)
+            if partOfDom is not None:
+                docinfo['partOfLabel'] = self.metadataService.getBibFormattedLabel(dom=partOfDom)
+                docinfo['partOfUrl'] = "%s?url=%s"%(self.getDocumentViewerURL(), partOfPath)
+                logging.debug("partOfLabel=%s partOfUrl=%s"%(docinfo['partOfLabel'],docinfo['partOfUrl']))
+
         # normalize path
         if 'imagePath' in docinfo and not docinfo['imagePath'].startswith('/'):
@@ -655 +664 @@
     def getDocinfoFromResource(self, docinfo, resource):
         """reads contents of resource element into docinfo"""
-        docName = resource.get('name', None)
+        logging.debug("getDocinfoFromResource: resource=%s"%(repr(resource)))
+        docName = getMDText(resource.get('name', None))
         docinfo['documentName'] = docName
-        docPath = resource.get('archive-path', None)
+        docPath = getMDText(resource.get('archive-path', None))
         if docPath:
             # clean up document path
@@ -671 +681 @@
             if not docUrl.startswith('http:'):
                 docPath = docUrl
+                
         if docPath:
             # fix URLs starting with /mpiwg/online
@@ -676 +687 @@
 
         docinfo['documentPath'] = docPath
+        
+        # is this part-of?
+        partOf = resource.get('is-part-of', None)
+        if partOf is not None:
+            partOf = getMDText(partOf.get('archive-path', None))
+            if partOf is not None:
+                docinfo['partOfPath'] = partOf.strip()
+                
         return docinfo
 

zpt/viewer/common_template.zpt

@@ -25 +25 @@
       </div>
       <div class="title" tal:condition="formattedLabel" tal:content="structure formattedLabel" />
+      <div class="title part-of" tal:condition="exists:docinfo/partOfPath">
+        part of: <a tal:attributes="href docinfo/partOfUrl" target="_blank" tal:content="structure docinfo/partOfLabel"/>
+      </div>
       <ul class="view-switcher" metal:define-slot="view-switcher">
         <li tal:condition="docpath" tal:attributes="class python:here.getStyle(viewMode, 'text')"><a