From 6fedb4f00c9c95c9d593643789deea55eee043c5 Mon Sep 17 00:00:00 2001 From: Al Niessner Date: Thu, 19 Sep 2024 08:30:51 -0700 Subject: [PATCH 1/3] correct typo in name --- src/main/java/gov/nasa/pds/harvest/cfg/ConfigManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/gov/nasa/pds/harvest/cfg/ConfigManager.java b/src/main/java/gov/nasa/pds/harvest/cfg/ConfigManager.java index 59a5b2b2..8f7686a6 100644 --- a/src/main/java/gov/nasa/pds/harvest/cfg/ConfigManager.java +++ b/src/main/java/gov/nasa/pds/harvest/cfg/ConfigManager.java @@ -27,7 +27,7 @@ public class ConfigManager indexNodeMap.put("pds-naif-registry", "PDS_NAIF"); indexNodeMap.put("pds-ppi-registry", "PDS_PPI"); indexNodeMap.put("pds-rms-registry", "PDS_RMS"); - indexNodeMap.put("pds-sbn-registry", "pds_SBN"); + indexNodeMap.put("pds-sbn-registry", "PDS_SBN"); indexNodeMap.put("psa-registry", "PSA"); indexNodeMap.put("jaxa-registry", "JAXA"); indexNodeMap.put("roscosmos", "ROSCOSMOS"); From add8ea47b5b3f51459ebdd0af34737409d08afe7 Mon Sep 17 00:00:00 2001 From: Al Niessner Date: Wed, 25 Sep 2024 13:37:19 -0700 Subject: [PATCH 2/3] update table for node names --- .../nasa/pds/harvest/cfg/ConfigManager.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/gov/nasa/pds/harvest/cfg/ConfigManager.java b/src/main/java/gov/nasa/pds/harvest/cfg/ConfigManager.java index 8f7686a6..46b2e3da 100644 --- a/src/main/java/gov/nasa/pds/harvest/cfg/ConfigManager.java +++ b/src/main/java/gov/nasa/pds/harvest/cfg/ConfigManager.java @@ -20,17 +20,18 @@ public class ConfigManager { private static HashMap indexNodeMap = new HashMap(); static { - indexNodeMap.put("pds-atm-registry", "PDS_ATM"); - indexNodeMap.put("pds-eng-registry", "PDS_ENG"); - indexNodeMap.put("pds-geo-registry", "PDS_GEO"); - indexNodeMap.put("pds-img-registry", "PDS_IMG"); - indexNodeMap.put("pds-naif-registry", "PDS_NAIF"); - indexNodeMap.put("pds-ppi-registry", "PDS_PPI"); - indexNodeMap.put("pds-rms-registry", "PDS_RMS"); - indexNodeMap.put("pds-sbn-registry", "PDS_SBN"); + indexNodeMap.put("atm-registry", "PDS_ATM"); + indexNodeMap.put("en-registry", "PDS_ENG"); + indexNodeMap.put("geo-registry", "PDS_GEO"); + indexNodeMap.put("img-registry", "PDS_IMG"); + indexNodeMap.put("naif-registry", "PDS_NAIF"); + indexNodeMap.put("ppi-registry", "PDS_PPI"); + indexNodeMap.put("rms-registry", "PDS_RMS"); + indexNodeMap.put("sbnpsi-registry", "PDS_SBN"); + indexNodeMap.put("sbnumd-registry", "PDS_SBN"); indexNodeMap.put("psa-registry", "PSA"); indexNodeMap.put("jaxa-registry", "JAXA"); - indexNodeMap.put("roscosmos", "ROSCOSMOS"); + indexNodeMap.put("dev-registry", "PDS_ENG_DEV"); } static public List exchangeFileRef (List xml2beans) { ArrayList beans = new ArrayList(); @@ -59,8 +60,7 @@ static public List exchangeLidvids (List ids) { } static public String exchangeIndexForNode (String indexName) { if (indexNodeMap.containsKey (indexName)) return indexNodeMap.get(indexName); - if (0 < indexName.indexOf("-registry")) return indexName.substring(0, indexName.indexOf("-registry")); - return "development"; + throw new IllegalArgumentException("Index (" + indexName + ") + not supported: either fix it in your configuration by using one of the supported or request an upgrade of harvest"); } static public ConnectionFactory exchangeRegistry (RegistryType xml) throws Exception { return EstablishConnectionFactory.from (xml.getValue(), xml.getAuth()); From cc5d27673356c6eb28ff2b42c8f85a424f4659ac Mon Sep 17 00:00:00 2001 From: al-niessner <1130658+al-niessner@users.noreply.github.com> Date: Thu, 3 Oct 2024 14:02:18 -0700 Subject: [PATCH 3/3] Update ConfigManager.java cut and pasted the string in there for ya --- src/main/java/gov/nasa/pds/harvest/cfg/ConfigManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/gov/nasa/pds/harvest/cfg/ConfigManager.java b/src/main/java/gov/nasa/pds/harvest/cfg/ConfigManager.java index 46b2e3da..9591bbba 100644 --- a/src/main/java/gov/nasa/pds/harvest/cfg/ConfigManager.java +++ b/src/main/java/gov/nasa/pds/harvest/cfg/ConfigManager.java @@ -60,7 +60,7 @@ static public List exchangeLidvids (List ids) { } static public String exchangeIndexForNode (String indexName) { if (indexNodeMap.containsKey (indexName)) return indexNodeMap.get(indexName); - throw new IllegalArgumentException("Index (" + indexName + ") + not supported: either fix it in your configuration by using one of the supported or request an upgrade of harvest"); + throw new IllegalArgumentException("Index (" + indexName + ") + not supported: either fix it in your configuration by using one of the supported or request an upgrade of harvest to support your new index by submitting a ticket on https://github.com/NASA-PDS/harvest/issues"); } static public ConnectionFactory exchangeRegistry (RegistryType xml) throws Exception { return EstablishConnectionFactory.from (xml.getValue(), xml.getAuth());