From 39ee147b7f3a700a44eb01578fe71c9617785411 Mon Sep 17 00:00:00 2001
From: Jordan Padams <jordan.h.padams@jpl.nasa.gov>
Date: Fri, 18 Oct 2024 19:31:57 -0700
Subject: [PATCH 1/2] Add landing pages for Telescope, Facility, Airborne

Also improved error messaging when Solr is down
---
 .../conf/search/defaults/pds/pds4/context.xml        | 12 ++++++++++++
 .../src/main/resources/policy/global-policy.xml      |  3 +++
 .../main/resources/collections/data/managed-schema   |  6 ++++++
 3 files changed, 21 insertions(+)

diff --git a/harvest-legacy/src/main/resources/conf/search/defaults/pds/pds4/context.xml b/harvest-legacy/src/main/resources/conf/search/defaults/pds/pds4/context.xml
index c4aaf09..8221763 100644
--- a/harvest-legacy/src/main/resources/conf/search/defaults/pds/pds4/context.xml
+++ b/harvest-legacy/src/main/resources/conf/search/defaults/pds/pds4/context.xml
@@ -111,6 +111,9 @@
       <registryPath>external_reference_doi</registryPath>
     </field>
     <!-- Airborne Fields -->
+    <field name="airborne_ref" type="string">
+      <registryPath>airborne_ref</registryPath>
+    </field>
     <field name="airborne_name" type="string">
       <registryPath>airborne_name</registryPath>
     </field>
@@ -121,6 +124,9 @@
       <registryPath>airborne_description</registryPath>
     </field>
     <!-- Facility Fields -->
+    <field name="facility_ref" type="string">
+      <registryPath>facility_ref</registryPath>
+    </field>
     <field name="facility_name" type="float">
       <registryPath>facility_name</registryPath>
     </field>
@@ -238,6 +244,9 @@
       <registryPath>person_description</registryPath>
     </field>
     <!-- Resource Fields -->
+    <field name="resource_ref" type="string">
+      <registryPath>resource_ref</registryPath>
+    </field>
     <field name="resource_name" type="string">
       <registryPath>resource_name</registryPath>
     </field>
@@ -264,6 +273,9 @@
       <registryPath>target_description</registryPath>
     </field>
     <!-- Telescope Fields -->
+    <field name="telescope_ref" type="string">
+      <registryPath>telescope_ref</registryPath>
+    </field>
     <field name="telescope_aperture" type="string">
       <registryPath>telescope_aperture</registryPath>
     </field>
diff --git a/harvest-legacy/src/main/resources/policy/global-policy.xml b/harvest-legacy/src/main/resources/policy/global-policy.xml
index 164783a..8b0bf57 100644
--- a/harvest-legacy/src/main/resources/policy/global-policy.xml
+++ b/harvest-legacy/src/main/resources/policy/global-policy.xml
@@ -2593,6 +2593,9 @@
        <modelValue>
          instrument_to_telescope
        </modelValue>
+       <modelValue>
+         investigation_to_telescope
+       </modelValue>
        <modelValue>
          is_telescope
        </modelValue>
diff --git a/registry-mgr-legacy/src/main/resources/collections/data/managed-schema b/registry-mgr-legacy/src/main/resources/collections/data/managed-schema
index 566829c..0c07be0 100644
--- a/registry-mgr-legacy/src/main/resources/collections/data/managed-schema
+++ b/registry-mgr-legacy/src/main/resources/collections/data/managed-schema
@@ -29,6 +29,8 @@
    <field name="lidvid" type="string" indexed="true" stored="true" required="true" multiValued="false" />
    <field name="abstract_text" type="text_general" indexed="false" stored="true" multiValued="true" />
    <field name="agency_name" type="lowercase" indexed="true" stored="true" multiValued="true" />
+   <field name="agency_ref" type="string" indexed="true" stored="true" multiValued="true" />
+   <field name="airborne_ref" type="string" indexed="true" stored="true" multiValued="true" />
    <field name="airborne_name" type="text_general" indexed="true" stored="true" multiValued="true" />
    <field name="airborne_type" type="text_general" indexed="true" stored="true" multiValued="true" />
    <field name="airborne_description" type="text_general" indexed="true" stored="true" multiValued="true" />
@@ -104,6 +106,7 @@
    <field name="data_set_release_date" type="lowercase" indexed="true" stored="true" multiValued="true" />
    <field name="description" type="text_general" indexed="false" stored="true" multiValued="true" />
    <field name="external_reference_text" type="text_general" indexed="false" stored="true" multiValued="true" />
+   <field name="facility_ref" type="string" indexed="true" stored="true" multiValued="true" />
    <field name="facility_name" type="text_general" indexed="true" stored="true" multiValued="true" />
    <field name="facility_type" type="text_general" indexed="true" stored="true" multiValued="true" />
    <field name="facility_address" type="text_general" indexed="true" stored="true" multiValued="true" />
@@ -139,6 +142,7 @@
    <field name="modification_date" type="pdate" indexed="false" stored="true" multiValued="true" />
    <field name="modification_description" type="text_general" indexed="false" stored="true" multiValued="true" />
    <field name="node_id" type="lowercase" indexed="true" stored="true" multiValued="true" />
+   <field name="node_ref" type="string" indexed="true" stored="true" multiValued="true" />
    <field name="objectType" type="lowercase" indexed="true" stored="true" multiValued="true" />
    <field name="observation_local_mean_solar_time" type="string" indexed="false" stored="true" multiValued="true" />
    <field name="observation_local_true_solar_time" type="string" indexed="false" stored="true" multiValued="true" />
@@ -185,6 +189,7 @@
    <field name="search_engine_type" type="text_general" indexed="true" stored="true" multiValued="true" />
 
    <!-- Product_Service fields -->
+   <field name="service_ref" type="string" indexed="true" stored="true" multiValued="true" />
    <field name="service_name" type="text_gen_sort" indexed="true" stored="true" multiValued="true" />
    <field name="service_abstract_desc" type="text_general" indexed="true" stored="true" multiValued="true" />
    <field name="service_version_id" type="string" indexed="true" stored="true" multiValued="true" />
@@ -205,6 +210,7 @@
    <field name="target_ref_target_type" type="text_en_splitting_tight" indexed="true" stored="true" multiValued="true" />
    <field name="target_type" type="text_en_splitting_tight" indexed="true" stored="true" multiValued="true" />
    <field name="telephone_number" type="string" indexed="false" stored="true" multiValued="true" />
+   <field name="telescope_ref" type="string" indexed="true" stored="true" multiValued="true" />
    <field name="telescope_aperture" type="pfloat" indexed="true" stored="true" multiValued="true" />
    <field name="telescope_longitude" type="pfloat" indexed="true" stored="true" multiValued="true" />
    <field name="telescope_latitude" type="pfloat" indexed="true" stored="true" multiValued="true" />

From 5c3ab223aa66f2957c65e42e94ad206f2a8c649c Mon Sep 17 00:00:00 2001
From: Jordan Padams <jordan.h.padams@jpl.nasa.gov>
Date: Sat, 16 Nov 2024 13:49:13 -0800
Subject: [PATCH 2/2] Update search core config for Documents

Add missing `resource_ref`

Resolves #154
---
 .../main/resources/conf/search/defaults/pds/pds4/document.xml  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/harvest-legacy/src/main/resources/conf/search/defaults/pds/pds4/document.xml b/harvest-legacy/src/main/resources/conf/search/defaults/pds/pds4/document.xml
index 5549fe1..053fc2a 100644
--- a/harvest-legacy/src/main/resources/conf/search/defaults/pds/pds4/document.xml
+++ b/harvest-legacy/src/main/resources/conf/search/defaults/pds/pds4/document.xml
@@ -177,6 +177,9 @@
     <field name="other_ref" type="string">
       <registryPath>other_ref</registryPath>
     </field>
+    <field name="resource_ref" type="string">
+      <registryPath>resource_ref</registryPath>
+    </field>
     <!-- Reference_List Fields -->
     <field name="external_reference_text" type="string">
       <registryPath>external_reference_text</registryPath>