Merge remote-tracking branch 'origin/master' into 636-related

hbz · Jan 25, 2024 · 9ccb20b · 9ccb20b
2 parents 037db08 + 08b3e11
commit 9ccb20b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/app/views/details.scala.html b/app/views/details.scala.html
@@ -60,7 +60,7 @@
       }
       <div class="row" id="search-results">
       @defining((Lobid.items(doc.toString),Lobid.itemDetails(doc.toString))) { case (items, itemDetails) =>
-        @defining(!(doc\\"containedIn").isEmpty && (doc\"type").toString.contains("Article")){superordination =>
+        @defining(!(doc\\"containedIn").isEmpty){superordination =>
           <div class="col-md-@if(items.isEmpty && !doc.toString.contains("fulltextOnline") && !superordination){12} else {8}">
             <dl>
             @defining(Lobid.shortId((doc\"id").asOpt[String].getOrElse(q))){ id =>

diff --git a/app/views/tags/result_doc.scala.html b/app/views/tags/result_doc.scala.html
@@ -32,7 +32,11 @@
         @if((pub \ "type").toString.contains("SecondaryPublicationEvent")){
           Sekundärpublikation
         } else {
-          Erschienen
+          @if(pub.toString.contains("manufacturedBy")) {
+            Hergestellt
+          } else {
+            Erschienen
+          }
         }
       </td>
       <td>
@@ -48,6 +52,7 @@
         <br/>
         @optional("", "location", pub)
         @optional("", "publishedBy", pub)
+        @optional("", "manufacturedBy", pub)
         @((pub\"frequency").asOpt[Seq[JsValue]].map { freq =>
           optional("", "label", freq.head)
         })
@@ -131,6 +136,7 @@
          components = (subject \ "componentList").asOpt[Seq[JsValue]].getOrElse(Seq(subject));
          component <- components;
          sourceLabel = (component\"source"\"label").asOpt[String];
+         if !sourceLabel.getOrElse("").contains("Freie Verschlagwortung");
          if !sourceLabel.getOrElse("").contains("Nordrhein-Westfälischen");
          if !sourceLabel.getOrElse("").contains("RPB-Sachgruppen");
          if !sourceLabel.getOrElse("").contains("Dewey");
@@ -255,6 +261,7 @@
   @result_field("", "thesisInformation", doc, TableRow.VALUES)
 
   @for(pub <- sortedPublications((doc\"publication").asOpt[Seq[JsValue]].getOrElse(Seq()))){ @publication(pub) }
+  @for(pub <- sortedPublications((doc\"manufacture").asOpt[Seq[JsValue]].getOrElse(Seq()))){ @publication(pub) }
   @result_field("Auflage", "edition", doc, TableRow.VALUES)
   @result_field("Inhalt", "abstract", doc, TableRow.VALUES)
   @result_field("Anmerkungen", "note", doc, TableRow.VALUES, node = Option(doc))