Adding author information to documents preview

Edirom · Jun 26, 2017 · ea1c281 · ea1c281
1 parent 312f6f7
commit ea1c281
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/modules/app.xqm b/modules/app.xqm
@@ -1545,7 +1545,7 @@ declare
         map {
             'doc' := $model('result-page-entry'),
             'docID' := $model('result-page-entry')/root()/*/data(@xml:id),
-            'relators' := $model('result-page-entry')//mei:fileDesc/mei:titleStmt/mei:respStmt/mei:persName[@role],
+            'relators' := $model('result-page-entry')//mei:fileDesc/mei:titleStmt/mei:respStmt/mei:persName[@role] | query:get-author-element($model('result-page-entry')),
             'biblioType' := $model('result-page-entry')/tei:biblStruct/data(@type),
             'workType' := $model('result-page-entry')//mei:term/data(@classcode)
         }
@@ -1630,15 +1630,18 @@ declare
 declare 
     %templates:wrap
     %templates:default("lang", "en")
-    function app:preview-relator-role($node as node(), $model as map(*), $lang as xs:string) as xs:string {
-        lang:get-language-string($model('relator')/data(@role), $lang)
+    function app:preview-relator-role($node as node(), $model as map(*), $lang as xs:string) as xs:string? {
+        if($model('relator')/self::mei:*/@role) then lang:get-language-string($model('relator')/data(@role), $lang)
+        else if($model('relator')/self::tei:author) then lang:get-language-string('aut', $lang)
+        else core:logToFile('warn', 'app:preview-relator-role(): Failed to reckognize role')
 };
 
 declare 
     %templates:wrap
     %templates:default("lang", "en")
     function app:preview-relator-name($node as node(), $model as map(*), $lang as xs:string) as xs:string {
         if($model('relator')/@dbkey) then query:title($model('relator')/@dbkey)
+        else if($model('relator')/@key) then query:title($model('relator')/@key)
         else str:normalize-space($model('relator'))
 };
 

diff --git a/templates/includes/preview-documents.html b/templates/includes/preview-documents.html
@@ -11,6 +11,14 @@ <h3 class="media-heading">
                 Schaul</a>
         </h3>
         <p data-template="app:preview-teaser" data-template-max="150">Some teaser text</p>
+        <!--<p>
+            <strong data-template="lang:translate">author</strong>: 
+            <span data-template="app:print" data-template-key="author"/>
+        </p>-->
+        <p data-template="app:each" data-template-from="relators" data-template-to="relator">
+            <strong data-template="app:preview-relator-role"/>: 
+            <span data-template="app:preview-relator-name"/>
+        </p>
         <p>
             <strong><span data-template="lang:translate">identifier</span>:</strong> 
             <span data-template="app:print" data-template-key="docID">A030043</span>