From d57000164f9053f1f7e2bc08b9090bbfa76b078b Mon Sep 17 00:00:00 2001
From: Andre Herzog <andre.herzog@gbv.de>
Date: Fri, 15 Mar 2024 09:39:37 +0100
Subject: [PATCH] PHTG-111 Added reseach area field to search forms and fixed
 metadata view

---
 .../META-INF/resources/content/search/complex.xed      | 10 +++++-----
 .../META-INF/resources/content/search/simple.xed       |  9 ++++-----
 .../resources/content/search/simple_intern.xed         |  9 ++++-----
 .../config/reposis_phtg/messages_de.properties         |  2 +-
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/main/resources/META-INF/resources/content/search/complex.xed b/src/main/resources/META-INF/resources/content/search/complex.xed
index e6cdc06..e450f20 100644
--- a/src/main/resources/META-INF/resources/content/search/complex.xed
+++ b/src/main/resources/META-INF/resources/content/search/complex.xed
@@ -89,11 +89,11 @@
                 <mir:template name="textInput"
                   xpath="condition[@field='id,isbn,mods.identifier']/@value" id="inputIdentifier1"
                   i18n="editor.search.mir.identifier" tooltip="editor.search.mir.identifier.tooltip" />
-              <!-- Institution -->
-                <mir:template name="selectInput"
-                  xpath="condition[@field='category.top'][1]/@value" id="inputInst1"
-                  i18n="editor.search.mir.institute" tooltip="editor.search.mir.institute.tooltip"
-                  uri="xslStyle:items2options:classification:editorComplete:-1:children:mir_institutes" />
+              <!-- Forschungsfeld -->
+              <mir:template name="selectInput"
+                  xpath="condition[@field='category.top'][1]/@value" id="inputResearchArea1"
+                  i18n="editor.search.project.research_areas" tooltip="editor.search.project.research_areas.tooltip"
+                  uri="xslStyle:items2options:classification:editorComplete:-1:children:research_areas"/>
               <!-- RVK Sachgruppe -->
               <mir:template name="selectInput"
                   xpath="condition[@field='category.top'][2]/@value" id="inputRVK1"
diff --git a/src/main/resources/META-INF/resources/content/search/simple.xed b/src/main/resources/META-INF/resources/content/search/simple.xed
index 5a143c3..fc87db6 100644
--- a/src/main/resources/META-INF/resources/content/search/simple.xed
+++ b/src/main/resources/META-INF/resources/content/search/simple.xed
@@ -48,11 +48,10 @@
 							<!-- Content -->
 							<mir:template name="textInput" xpath="condition[@field='content']/@value" id="inputContent1"
 														i18n="editor.search.derivate" tooltip="editor.search.derivate.tooltip"/>
-							<!-- Institution -->
-							<mir:template name="selectInput" xpath="condition[@field='category'][1]/@value"
-														id="inputInst1" i18n="editor.search.mir.institute"
-														tooltip="editor.search.mir.institute.tooltip"
-														uri="xslStyle:items2options:classification:editorComplete:-1:children:mir_institutes"/>
+							<!-- Forschungsfeld -->
+							<mir:template name="selectInput" xpath="condition[@field='category.top'][1]/@value" id="inputResearchArea1"
+														i18n="editor.search.project.research_areas" tooltip="editor.search.project.research_areas.tooltip"
+														uri="xslStyle:items2options:classification:editorComplete:-1:children:research_areas"/>
 							<!--Fulltext -->
 							<div class="form-group row">
 								<label for="inputFulltext1" class="col-md-3 col-form-label text-right">
diff --git a/src/main/resources/META-INF/resources/content/search/simple_intern.xed b/src/main/resources/META-INF/resources/content/search/simple_intern.xed
index 86de4ca..1d515bb 100644
--- a/src/main/resources/META-INF/resources/content/search/simple_intern.xed
+++ b/src/main/resources/META-INF/resources/content/search/simple_intern.xed
@@ -47,11 +47,10 @@
 							<!-- Content -->
 							<mir:template name="textInput" xpath="condition[@field='content']/@value" id="inputContent1"
 														i18n="editor.search.derivate" tooltip="editor.search.derivate.tooltip"/>
-							<!-- Institution -->
-							<mir:template name="selectInput" xpath="condition[@field='category'][1]/@value" id="inputInst1"
-														i18n="editor.search.mir.institute"
-														tooltip="editor.search.mir.institute.tooltip"
-														uri="xslStyle:items2options:classification:editorComplete:-1:children:mir_institutes"/>
+							<!-- Forschungsfeld -->
+							<mir:template name="selectInput" xpath="condition[@field='category.top'][1]/@value" id="inputResearchArea1"
+														i18n="editor.search.project.research_areas" tooltip="editor.search.project.research_areas.tooltip"
+														uri="xslStyle:items2options:classification:editorComplete:-1:children:research_areas"/>
 							<!-- /xed:bind> TODO: realize search dependent on current user and state
 							<xed:bind xpath="boolean[@operator='or']" default="{$CurrentUser}" -->
 							<!-- xed:bind xpath="condition[@field='createdby']/@value" default="{$CurrentUser}" / -->
diff --git a/src/main/resources/config/reposis_phtg/messages_de.properties b/src/main/resources/config/reposis_phtg/messages_de.properties
index e29be8e..ff6f386 100644
--- a/src/main/resources/config/reposis_phtg/messages_de.properties
+++ b/src/main/resources/config/reposis_phtg/messages_de.properties
@@ -5,7 +5,7 @@ component.mods.metaData.dictionary.identifier.intern        = Bestand Campus-Bib
 component.mods.metaData.dictionary.oa                       = OA-Status
 component.mods.metaData.dictionary.peer_review              = Peer-Reviewed
 component.mods.metaData.dictionary.publisher.creation       = Name der Institution
-component.mods.metaData.dictionary.research_areas           = Forschungsbereich
+component.mods.metaData.dictionary.research_fields          = Forschungsbereich
 component.mods.metaData.dictionary.rvk                      = RVK
 editor.search.mir.rvk                           = RVK
 editor.search.mir.rvk.tooltip                   = Auf der RVK basierende Sachgruppenklassifikation.