search_solr_tools 6.5.0 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: daf440444527ee68761274399910b02c51d7994a1b605c57f64b2666d7a243c7
-  data.tar.gz: 13a1a0ccd9d623aad334f68c6d314f7205a48a45546393d3d2ed4d71a95899cc
+  metadata.gz: 530f796b476abca9b117b20772a9e48f9d3e5d8cb61d86d4ca5970358e8ae327
+  data.tar.gz: 761014cbd63831a690a41bb33e1d2502d594b4b912c4b37dfb5bef12af8b7c5a
 SHA512:
-  metadata.gz: 2b195f73dc88f1fcf83b354f7ea572082419172970ced5e15e7f7afdb89f47da85424b473e9aa87462483f3ba6c5a2e1e2eb33c1493d72a978ff6570d86d9645
-  data.tar.gz: 96b72cadd2046588046b56a9911ee14caefead8813c38d579b93d9df56b00afacfeae13033c3ed5b866076c81aa694ccdf77fe024c354191c52d65db04c7f186
+  metadata.gz: cd8c55dcbf7429734006d7d9e1f44f212053d3047e00f6d299830bf3eaa042ae0f618f38671aa6908237788408fc5fede53cba6ec26c6b7ab8a462a142c39ac6
+  data.tar.gz: f95560780bf47eb72e54a93a5195a59ba6a3dec20dc6e297e62045a0ab965821a634d4a76f44adbd05e779511c5f3e4b78fa982711f65c788aaccdd96dee0952

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## v7.0.0 (2023-10-09)
+
+  - Updating harvesting to include cumulus value
+  - Adding a new facet that will cover both cumulus and global spatial
+    coverage.
+
+## v6.5.1 (2023-09-26)
+
+  - Updating logging default configuration
+
 ## v6.5.0 (2023-09-21)
 
   - Adding logging functionality to the code, including the ability

data/bin/search_solr_tools

@@ -126,7 +126,7 @@ class SolrHarvestCLI < Thor
     harvester.delete_old_documents(options[:timestamp],
                                    "data_centers:\"#{SearchSolrTools::Helpers::SolrFormat::DATA_CENTER_NAMES[options[:data_center].upcase.to_sym][:long_name]}\"",
                                    SearchSolrTools::SolrEnvironments[harvester.environment][:collection_name],
-                                   true)
+                                   force: true)
     logger.info("DELETE ALL for data center '#{options[:data_center]}' complete")
   end
 

data/lib/search_solr_tools/config/environments.yaml

@@ -11,7 +11,7 @@
 
   # Log details.  Can be overridden by environment-specific values
   :log_file: /var/log/search-solr-tools.log
-  :log_file_level: warn
+  :log_file_level: debug
   :log_stdout_level: info
 
 :local:
@@ -25,7 +25,7 @@
   :host: dev.search-solr.USERNAME.dev.int.nsidc.org
   ## For the metadata content, either set up your own instance of dataset-catalog-services
   ## or change the URL below to point to integration
-  :nsidc_dataset_metadata_url: http://dev.dcs.USERNAME.dev.int.nsidc.org:1580/api/dataset/metadata/
+  :nsidc_dataset_metadata_url: http://dev.dcs.USERNAME.dev.int.nsidc.org:11580/api/dataset/metadata/
 
 :development:
   <<: *dev

data/lib/search_solr_tools/translators/nsidc_json.rb

@@ -26,6 +26,7 @@ module SearchSolrTools
           'dataset_version'           => json_doc['majorVersion']['version'],
           'data_centers'              => Helpers::SolrFormat::DATA_CENTER_NAMES[:NSIDC][:long_name],
           'facet_data_center'         => "#{Helpers::SolrFormat::DATA_CENTER_NAMES[:NSIDC][:long_name]} | #{Helpers::SolrFormat::DATA_CENTER_NAMES[:NSIDC][:short_name]}",
+          'cumulus'                   => json_doc['cumulus'],
           'authors'                   => translate_personnel_and_creators_to_authors(json_doc['personnel'], generate_data_citation_creators(json_doc['dataCitation'])),
           'topics'                    => translate_iso_topic_categories(json_doc['isoTopicCategories']),
           'parameters'                => translate_parameters(json_doc['parameters']),
@@ -38,7 +39,6 @@ module SearchSolrTools
           'spatial_coverages'         => Helpers::TranslateSpatialCoverage.geojson_to_spatial_display_str(spatial_coverages),
           'spatial'                   => Helpers::TranslateSpatialCoverage.geojson_to_spatial_index_str(spatial_coverages),
           'spatial_area'              => Helpers::TranslateSpatialCoverage.geojson_to_spatial_area(spatial_coverages),
-          'facet_spatial_coverage'    => Helpers::TranslateSpatialCoverage.geojson_to_global_facet(spatial_coverages),
           'facet_spatial_scope'       => Helpers::TranslateSpatialCoverage.geojson_to_spatial_scope_facet(spatial_coverages),
           'temporal_coverages'        => temporal_coverage_values['temporal_coverages'],
           'temporal_duration'         => temporal_coverage_values['temporal_duration'],
@@ -54,7 +54,8 @@ module SearchSolrTools
           'facet_sponsored_program'   => translate_short_long_names_to_facet_value(json_doc['internalDataCenters']),
           'facet_temporal_resolution' => translate_temporal_resolution_facet_values(json_doc['parameters']),
           'facet_spatial_resolution'  => translate_spatial_resolution_facet_values(json_doc['parameters']),
-          'sponsored_programs'        => translate_internal_datacenters(json_doc['internalDataCenters'])
+          'sponsored_programs'        => translate_internal_datacenters(json_doc['internalDataCenters']),
+          'facet_featured'            => translate_featured(json_doc, spatial_coverages)
         )
       end
       # rubocop:enable Metrics/MethodLength
@@ -204,6 +205,19 @@ module SearchSolrTools
         json_strings.uniq
       end
 
+      def translate_featured(json, spatial_coverages)
+        facet_featured = []
+
+        # Add the Earthdata Cloud feature
+        facet_featured << 'In Earthdata Cloud' if json['cumulus']
+
+        # Add the "Global" spatial coverage to this facet
+        global = Helpers::TranslateSpatialCoverage.geojson_to_global_facet(spatial_coverages)
+        facet_featured << global unless global.nil?
+
+        facet_featured
+      end
+
       def generate_data_citation_creators(data_citation)
         data_citation.nil? ? [] : data_citation['creators']
       end

data/lib/search_solr_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SearchSolrTools
-  VERSION = '6.5.0'
+  VERSION = '7.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: search_solr_tools
 version: !ruby/object:Gem::Version
-  version: 6.5.0
+  version: 7.0.0
 platform: ruby
 authors:
 - Chris Chalstrom
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-21 00:00:00.000000000 Z
+date: 2023-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-geos