rework handling of multiple imprints with fallback

Author: SteffenAstheimer

catalogues/dictionary_de.xml

@@ -458,7 +458,6 @@
     <entry xml:id="editorialGuidelines-text">Editionsrichtlinien Text</entry>
     <entry xml:id="restrictSelection">Auswahl einschränken</entry>
     <entry xml:id="and">und</entry>
-    <entry xml:id="publishedIn">erschienen in</entry>
     <entry xml:id="vol">Bd.</entry>
     <entry xml:id="jg">Jg.</entry>
     <entry xml:id="pp">S.</entry>

catalogues/dictionary_en.xml

@@ -428,7 +428,6 @@
     <entry xml:id="editorialGuidelines-text">Editorial Guidelines Text</entry>
     <entry xml:id="restrictSelection">Restrict selection</entry>
     <entry xml:id="and">and</entry>
-    <entry xml:id="publishedIn">published in</entry>
     <entry xml:id="vol">vol.</entry>
     <entry xml:id="jg">Jg.</entry>
     <entry xml:id="pp">pp.</entry>

modules/app.xqm

@@ -1930,7 +1930,7 @@ declare
         let $biblStruct := $model('result-page-entry')//tei:biblStruct[1]
         let $journalCitations :=
             if(count($biblStruct/tei:monogr/tei:imprint) gt 1)
-            then bibl:printJournalCitationsByImprint($biblStruct/tei:monogr, <xhtml:li class="journal-citation"/>, $lang)
+            then bibl:printJournalCitationPerImprint($biblStruct/tei:monogr, <xhtml:li class="journal-citation"/>, $lang)
             else ()
         return 
             map {
@@ -1983,7 +1983,7 @@ declare
             case element(tei:biblStruct) return 
                 element {node-name($node)} {
                     $node/@*,
-                    bibl:printCitation($source, <xhtml:p/>, $lang)/node()
+                    bibl:printCitation($source, <xhtml:p/>, $lang)/node()[not(self::xhtml:span[@class=('deleteme_journalTitle', 'deleteme_imprintSection')])]
                 }
             default return ()
 };

modules/bibl.xqm

@@ -175,9 +175,21 @@ declare function bibl:printIncollectionCitation($biblStruct as element(tei:biblS
  : @return element
  :)
 declare function bibl:printJournalCitation($monogr as element(tei:monogr), $wrapperElement as element(), $lang as xs:string) as element()? {
-    if (count($monogr/tei:imprint) = 1) then
-        bibl:print-journal-citation-from-imprint($monogr, $monogr/tei:imprint, $wrapperElement, $lang)
-    else ()
+    let $journalTitle := 
+        if (count($monogr/tei:imprint) gt 1)
+        then <xhtml:span class="deleteme_journalTitle">{bibl:printTitles($monogr/tei:title, $monogr/tei:edition)/node()}</xhtml:span>
+        else (<xhtml:span class="journalTitle">{bibl:printTitles($monogr/tei:title, $monogr/tei:edition)/node()}</xhtml:span>)
+    let $biblScope := 
+        if (count($monogr/tei:imprint) gt 1)
+        then for $imprint in $monogr/tei:imprint
+            return <xhtml:span class="deleteme_imprintSection">{bibl:biblScope($imprint, $lang)}</xhtml:span>
+        else <xhtml:span class="imprint">{bibl:biblScope($monogr/tei:imprint, $lang)}</xhtml:span>
+    return
+        element {$wrapperElement/name()} {
+            $wrapperElement/@*,
+            $journalTitle,
+            $biblScope
+        }
 };
 
 (:~
@@ -189,23 +201,17 @@ declare function bibl:printJournalCitation($monogr as element(tei:monogr), $wrap
  : @param $lang the language switch (en, de)
  : @return element*
  :)
-declare function bibl:printJournalCitationsByImprint($monogr as element(tei:monogr), $wrapperElement as element(), $lang as xs:string) as element()* {
+declare function bibl:printJournalCitationPerImprint($monogr as element(tei:monogr), $wrapperElement as element(), $lang as xs:string) as element()* {
     for $imprint in $monogr/tei:imprint
-    return bibl:print-journal-citation-from-imprint($monogr, $imprint, $wrapperElement, $lang)
-};
-
-(:~
- : Helper function for bibl:printJournalCitation() and bibl:printJournalCitationsByImprint()
- :)
-declare %private function bibl:print-journal-citation-from-imprint($monogr as element(tei:monogr), $imprint as element(tei:imprint), $wrapperElement as element(), $lang as xs:string) as element() {
-    let $journalTitle := <xhtml:span class="journalTitle">{bibl:printTitles($monogr/tei:title, $monogr/tei:edition)/node()}</xhtml:span>
-    let $biblScope := bibl:biblScope($imprint, $lang)
-    return
-        element {$wrapperElement/name()} {
-            $wrapperElement/@*,
-            $journalTitle,
-            $biblScope
-        }
+    return 
+        let $journalTitle := <xhtml:span class="journalTitle">{bibl:printTitles($monogr/tei:title, $monogr/tei:edition)/node()}</xhtml:span>
+        let $biblScope := <xhtml:span class="imprintSection">{bibl:biblScope($imprint, $lang)}</xhtml:span>
+        return
+            element {$wrapperElement/name()} {
+                $wrapperElement/@*,
+                $journalTitle,
+                $biblScope
+            }
 };
 
 (:~

resources/sass/pages/_search.scss

@@ -42,7 +42,8 @@
     .wega-volltext,
     .journal-citation {
         display: block;
-        margin-left: 1em;
+        margin-left: 3em;
+        text-indent: -1em;
     }
 
     .doi-link {

templates/includes/preview-biblio.html

@@ -9,16 +9,12 @@
             <a data-template="app:preview-title">Biblio Title</a>
         </h3>-->
         <p data-template="app:preview-citation" class="biblio-entry">
-            Allgemeine Musikalische Zeitung (13.
-            September 1809)
+            Johann Andreas Stumpff, Huldigung, Karl Maria von Weber nach der ersten Erscheinung des „Oberon“ (am 12. April.), in: Berliner Allgemeine Musikalische Zeitung, Jg. 3, Nr. 37 (13. September 1826), S. 293
         </p>
 
         <div data-template="app:process-biblio-publishing" data-template-wrap="no">
             <ul data-template="app-shared:if-exists" data-template-key="journalCitations" class="publishing-info">
-                <li>
-                    <strong><span data-template="lang:translate" data-template-key="publishedIn">publishedIn</span>:</strong>
-                </li>
-                <li data-template="app-shared:output" data-template-key="journalCitations" data-template-wrap="no">…</li>
+                <li data-template="app-shared:output" data-template-key="journalCitations" data-template-wrap="no">Berliner Allgemeine Musikalische Zeitung, Jg. 3, Nr. 37 (13. September 1826), S. 293</li>
             </ul>
         </div>
 

testing/xqsuite/biblio-tests.xqm

@@ -154,7 +154,7 @@ declare
     function bt:test-printJournalCitationsByImprint($a as xs:string) as element()+ {
         let $doc := crud:doc($a)
         return
-            bibl:printJournalCitationsByImprint($doc//tei:monogr, <xhtml:li/>, 'de')
+            bibl:printJournalCitationPerImprint($doc//tei:monogr, <xhtml:li/>, 'de')
 };
 
 declare %private function bt:normalize-hrefs($nodes as node()*) as node()* {