remove display of dedicatees from the basic data

move it to the main section/tab #169
Edirom · Jul 5, 2018 · e6d6cb8 · e6d6cb8
1 parent 483c58a
commit e6d6cb8
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/modules/app.xqm b/modules/app.xqm
@@ -759,7 +759,7 @@ declare
     function app:work-basic-data($node as node(), $model as map(*)) as map(*) {
         map {
             'ids' := $model?doc//mei:altId[not(@type='gnd')],
-            'relators' := $model?doc//mei:fileDesc/mei:titleStmt/mei:respStmt/mei:persName[@role] | query:get-author-element($model('result-page-entry')),
+            'relators' := query:relators($model?doc),
             'workType' := $model('doc')//mei:term/data(@classcode),
             'titles' := for $title in $model?doc//mei:meiHead/mei:fileDesc/mei:titleStmt/mei:title
                         group by $xmllang := $title/@xml:lang
@@ -779,6 +779,7 @@ declare
                 doc(concat($config:xsl-collection-path, '/works.xsl')), 
                 config:get-xsl-params( map {'dbPath' := document-uri($model?doc), 'docID' := $model?docID })
                 ), 
+            'dedicatees' := $model?doc//mei:fileDesc/mei:titleStmt/mei:respStmt/mei:persName[@role='dte'],
             'backlinks' := core:getOrCreateColl('backlinks', $model('docID'), true()),
             'gnd' := query:get-gnd($model('doc')),
             'xml-download-url' := replace(app:createUrlForDoc($model('doc'), $model('lang')), '\.html', '.xml')
@@ -1530,7 +1531,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] | query:get-author-element($model('result-page-entry')),
+            'relators' := query:relators($model('result-page-entry')),
             'biblioType' := $model('result-page-entry')/tei:biblStruct/data(@type),
             'workType' := $model('result-page-entry')//mei:term/data(@classcode)
         }
@@ -1639,8 +1640,11 @@ declare
     %templates:default("popover", "false")
     function app:preview-relator-name($node as node(), $model as map(*), $lang as xs:string, $popover as xs:string) as element() {
         let $key := $model('relator')/@dbkey | $model('relator')/@key
+        let $myPopover := 
+            if($popover castable as xs:boolean) then xs:boolean($popover)
+            else false()
         return
-            if($key and $popover=('true', '1')) then app:createDocLink(core:doc($key), query:title($key), $lang, (), true())
+            if($key and $myPopover) then app:createDocLink(core:doc($key), query:title($key), $lang, (), true())
             else element span {
                 str:normalize-space($model('relator'))
             }

diff --git a/modules/query.xqm b/modules/query.xqm
@@ -414,3 +414,13 @@ declare function query:placeName-elements($parent-nodes as node()*) as node()* {
     for $parent in $parent-nodes
     return $parent/*[self::tei:placeName or self::tei:settlement or self::tei:region or self::tei:country]
 };
+
+(:~
+ :  Return persnames responsible for a work
+ :
+ :  @param $doc the TEI or MEI document to look for the relators
+ :  @return mei:persName or tei:persName elements
+~:)
+declare function query:relators($doc as document-node()?) as element()* {
+    $doc//mei:fileDesc/mei:titleStmt/mei:respStmt/mei:persName[@role][not(@role='dte')] | query:get-author-element($doc)
+};
diff --git a/templates/work.html b/templates/work.html
@@ -117,6 +117,14 @@ <h2 data-template="lang:translate">documents</h2>
                                             <div class="tab-content">
                                                 <div class="tab-pane active fade in" id="wegaText">
                                                     <h2 data-template="lang:translate">informationAboutTheWork</h2>
+                                                    <div data-template="app-shared:if-exists" data-template-key="dedicatees">
+                                                        <h3 data-template="lang:translate">dedicatees</h3>
+                                                        <ul>
+                                                            <li data-template="app-shared:each" data-template-from="dedicatees" data-template-to="relator">
+                                                                <span data-template="app:preview-relator-name" data-template-popover="true">Amalie, Königin von Sachsen</span>
+                                                            </li>
+                                                        </ul>
+                                                    </div>
                                                     <div data-template="app-shared:if-exists" data-template-key="creation">
                                                         <h3 data-template="lang:translate">creation</h3>
                                                         <div data-template="app-shared:output" data-template-key="creation"/>