search_solr_tools 6.5.1 → 7.0.0.pre.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca0e8ee06335ce5c99f4305f595c8c8009b6456d18326bb0525c20e6f7c37a2c
-  data.tar.gz: 3412c5cd1c53b0b593e3a9506cb1cb7e66173f7fe2b6fd39d7c7140af2fbcdaa
+  metadata.gz: 68807979649e130e06f9c2758edb4a48f70222547f4638dcb6aefe1758d9496a
+  data.tar.gz: c8fbd92c84e6a99c30fc4eddecf3b6b2eb74bed34297e10ac04cb6dd37dc0451
 SHA512:
-  metadata.gz: bdd87f631012d9f0d6d4907ff814f4e56656d3d29c687c39358de2bd1fa063042645ac62b1dc3fbe0cf158da5631cbd1f0125c3999589bbea02afb31084ad92e
-  data.tar.gz: ad816eaed846f1ab827d3093a1b8de0c1699f16e42b31dab30b751ebcfada1170b8630788db1379761a960ab88fb24f6adb2ba0d09dafbcb8a89b6eb5435f3fd
+  metadata.gz: 45c0848c5846810833f0af72058dd6ddb3061763482bc8e8975189cf499705a5cd9133bf41d92ae0b9b131d549d3061266937cf52b377c393940b29aa186e8f1
+  data.tar.gz: db80eaceae3878825dbee0e90db9ec6a0774ad00b3418ba600528837115612253f6f3b09a8da69ae76de198a155d674a95240eb83151d1edb4894ef61dd72af8

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 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

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

@@ -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.1'
+  VERSION = '7.0.0-alpha'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: search_solr_tools
 version: !ruby/object:Gem::Version
-  version: 6.5.1
+  version: 7.0.0.pre.alpha
 platform: ruby
 authors:
 - Chris Chalstrom
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-26 00:00:00.000000000 Z
+date: 2023-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-geos
@@ -379,9 +379,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 3.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.4.10
 signing_key: