Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Properly set the ops:Harvest_Info/ops:node_name values, remove obsolete node_name in configuration file #188

Merged
merged 3 commits into from
Oct 8, 2024
Merged

Properly set the ops:Harvest_Info/ops:node_name values, remove obsolete node_name in configuration file #188

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6fedb4f
correct typo in name
Sep 19, 2024
add8ea4
update table for node names
Sep 25, 2024
cc5d276
Update ConfigManager.java
al-niessner Oct 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions src/main/java/gov/nasa/pds/harvest/cfg/ConfigManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,18 @@ public class ConfigManager
{
private static HashMap<String,String> indexNodeMap = new HashMap<String,String>();
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<FileRefRule> exchangeFileRef (List<FileRefType> xml2beans) {
ArrayList<FileRefRule> beans = new ArrayList<FileRefRule>();
Expand Down Expand Up @@ -59,8 +60,7 @@ static public List<String> exchangeLidvids (List<CollectionType> 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 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());
Expand Down