search_solr_tools 3.5.1 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 943858adbfab17cc599ccab60711c25f757b4531
-  data.tar.gz: 284281a588c8cf01ffb497ac69fa2c7bdcce8b4c
+  metadata.gz: fd15c0c642948b78d62d5d037165231313d46db3
+  data.tar.gz: 27533d22f692b1a5eb82ac95a7bd42107833ec50
 SHA512:
-  metadata.gz: 8207ca6773734a3df364812c61516b108f47b60e7e7839f4acbaa61ad3d3f035d4e5e1273420bf58bee944809e0be6a60babcfdb9aed36d170c61bbe8e598cc1
-  data.tar.gz: b0756d5ba461c485ad6aaaf2fc7ba28861ebc4c204b262769c7d8ba5c39792fa543b41fb37395ce9e57380bb4c2388a79f66c035089c1d43a57dcf4adf2655fa
+  metadata.gz: f5b173eea4feaadf84ec0c466b201d4a91253c64b83b2abe47f36555a92eac7fafb116e9692c7cc80bdebd55e434b8645ffdf56f4f650cc11f0b357e1ce0d824
+  data.tar.gz: 60c2871f475e7e2c9f2d85a2ce510cae73890ba329759b0c7bb200c29e8b05f0c3b14f6281209738a900606a814b9198069434978a2ce522aa3abdd15e93aa63

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## v3.3.3 (2015-05-10)
+
+New Features
+
+  - Add support for ingesting Data Access Links from NSIDC JSON
+
+
+## v3.3.2
+
+Bugfix
+
+  - Added quote checking for cisl offset parsing check
+
 ## v3.3.1
 
 Bugfix

data/lib/search_solr_tools/config/environments.yaml

@@ -40,40 +40,35 @@
   :host: localhost
   :nsidc_dataset_metadata_url: http://integration.nsidc.org/api/dataset/metadata/
   :nsidc_oai_identifiers_url: http://integration.nsidc.org/api/dataset/metadata/oai?verb=ListIdentifiers&metadata_prefix=iso
-  :oai_url: http://liquid.colorado.edu:11580/api/dataset/2/oai?verb=ListRecords&metadata_prefix=iso
 
 :dev:
-  :host: dev.search-solr.apps.int.nsidc.org
-  :nsidc_dataset_metadata_url: http://integration.nsidc.org/api/dataset/metadata/
-  :nsidc_oai_identifiers_url: http://integration.nsidc.org/api/dataset/metadata/oai?verb=ListIdentifiers&metadata_prefix=iso
-  :oai_url: http://liquid.colorado.edu:11580/api/dataset/2/oai?verb=ListRecords&metadata_prefix=iso
+  ## For the below, you'll need to instantiate your own search-solr instance, and point host to that.
+  :host: dev.search-solr.USERNAME.dev.int.nsidc.org
+  ## For these, either set up your own instance of dataset serach catalog or change it to point to integration
+  :nsidc_dataset_metadata_url: http://dev.dcs.USERNAME.dev.int.nsidc.org:1580/api/dataset/metadata/
+  :nsidc_oai_identifiers_url: http://dev.dcs.USERNAME.dev.int.nsidc.org:1580/api/dataset/metadata/oai?verb=ListIdentifiers&metadata_prefix=iso
 
 :integration:
   :host: integration.search-solr.apps.int.nsidc.org
   :nsidc_dataset_metadata_url: http://integration.nsidc.org/api/dataset/metadata/
   :nsidc_oai_identifiers_url: http://integration.nsidc.org/api/dataset/metadata/oai?verb=ListIdentifiers&metadata_prefix=iso
-  :oai_url: http://liquid.colorado.edu:11580/api/dataset/2/oai?verb=ListRecords&metadata_prefix=iso
 
 :qa:
   :host: qa.search-solr.apps.int.nsidc.org
   :nsidc_dataset_metadata_url: http://qa.nsidc.org/api/dataset/metadata/
   :nsidc_oai_identifiers_url: http://qa.nsidc.org/api/dataset/metadata/oai?verb=ListIdentifiers&metadata_prefix=iso
-  :oai_url: http://brash.colorado.edu:11580/api/dataset/2/oai?verb=ListRecords&metadata_prefix=iso
 
 :staging:
   :host: staging.search-solr.apps.int.nsidc.org
   :nsidc_dataset_metadata_url: http://staging.nsidc.org/api/dataset/metadata/
   :nsidc_oai_identifiers_url: http://staging.nsidc.org/api/dataset/metadata/oai?verb=ListIdentifiers&metadata_prefix=iso
-  :oai_url: http://freeze.colorado.edu:11580/api/dataset/2/oai?verb=ListRecords&metadata_prefix=iso
 
 :blue:
   :host: blue.search-solr.apps.int.nsidc.org
   :nsidc_dataset_metadata_url: http://nsidc.org/api/dataset/metadata/
   :nsidc_oai_identifiers_url: http://nsidc.org/api/dataset/metadata/oai?verb=ListIdentifiers&metadata_prefix=iso
-  :oai_url: http://frozen.colorado.edu:11580/api/dataset/2/oai?verb=ListRecords&metadata_prefix=iso
 
 :production:
   :host: search-solr.apps.int.nsidc.org
   :nsidc_dataset_metadata_url: http://nsidc.org/api/dataset/metadata/
   :nsidc_oai_identifiers_url: http://nsidc.org/api/dataset/metadata/oai?verb=ListIdentifiers&metadata_prefix=iso
-  :oai_url: http://frozen.colorado.edu:11580/api/dataset/2/oai?verb=ListRecords&metadata_prefix=iso

data/lib/search_solr_tools/translators/nsidc_json.rb

@@ -46,9 +46,11 @@ module SearchSolrTools
           'facet_format' => (json_doc['distributionFormats'].empty?) ? [Helpers::SolrFormat::NOT_SPECIFIED] : translate_format_to_facet_format(json_doc['distributionFormats']),
           'source' => %w(NSIDC ADE),
           'popularity' => json_doc['popularity'],
+          'data_access_urls' => translate_data_access_urls(json_doc['dataAccessLinks']),
           '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'])
+          'facet_spatial_resolution' => translate_spatial_resolution_facet_values(json_doc['parameters']),
+          'sponsored_programs' => translate_internal_datacenters(json_doc['internalDataCenters'])
         )
       end
       # rubocop:enable Metrics/MethodLength
@@ -98,6 +100,30 @@ module SearchSolrTools
         iso_topic_categories_json.map { |t| t['name'] } unless iso_topic_categories_json.nil?
       end
 
+      def translate_data_access_urls(json)
+        values = []
+        return values if json.nil?
+        json.each do |json_entry|
+          link_display = json_entry['displayText'].nil? ? '' : json_entry['displayText']
+          link_type = json_entry['type'].nil? ? '' : json_entry['type']
+          link_uri = json_entry['uri'].nil? ? '' : json_entry['uri']
+          link_desc = json_entry['description'].nil? ? '' : json_entry['description']
+
+          values << "#{link_display} | #{link_type} | #{link_uri} | #{link_desc}"
+        end
+        values
+      end
+
+      def translate_internal_datacenters(json)
+        values = []
+        return values if json.nil?
+        json.each do |json_entry|
+          short_name = json_entry['shortName'].nil? ? '' : json_entry['shortName']
+          values << short_name
+        end
+        values
+      end
+
       def translate_short_long_names_to_facet_value(json)
         facet_values = []
         return facet_values if json.nil?

data/lib/search_solr_tools/version.rb

@@ -1,3 +1,3 @@
 module SearchSolrTools
-  VERSION = '3.5.1'
+  VERSION = '3.7.0'
 end

data/search_solr_tools.gemspec

@@ -42,4 +42,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.2'
   spec.add_development_dependency 'rubocop', '~> 0.32'
   spec.add_development_dependency 'webmock', '~> 1.13'
+  spec.add_development_dependency 'listen', '3.0.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: search_solr_tools
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.7.0
 platform: ruby
 authors:
 - Chris Chalstrom
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-15 00:00:00.000000000 Z
+date: 2016-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso8601
@@ -252,6 +252,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.13'
+- !ruby/object:Gem::Dependency
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.5
 description: |2
       Ruby translators to transform various metadata feeds into solr documents and
       a command-line utility to access/utilize the gem's translators to harvest