dor-services 5.0.1 → 5.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f49ca049f1d4c644bc7e51811bc36562298ba729
-  data.tar.gz: 401af70a4012e11c8a26b8d9c0c3f871bd5b1a9e
+  metadata.gz: f18cae14cad4e7d46c99fd2805fb8517ef0d4020
+  data.tar.gz: 853c360a25789be6c4d541e20ddd5f875bf9aaca
 SHA512:
-  metadata.gz: fd74c7ff789ae4e0e06f8dc29e8460501f64c8f765fee7addd406d61692fb7e83e037b5961a502a0d367a533dcecb112aea14a3e1e421128079b5862a22935b3
-  data.tar.gz: bcab2bbfdcd50f81c5465633d62b1c7b5d4d198f5ce5824f742a4e2f34fc48930783ff7dd30bdab006859e9b8c2c5b68b3a43a450bc72db1d6b449dc3d3b89c1
+  metadata.gz: 06e4ded70b6d91f0751240b1b122260c6ac0d7994405e9e37b2192e83655235ad807d377a80114449ef3db79741b3d4084cc373d88bee1a495670fbed16822ac
+  data.tar.gz: 1624211169fdcfb9f7da970bb614a0f5e3d9704f9e551acde3d497c4f22b178f8c5a8c92c7aade636cf10c4fdf03387aba196b2d178029a4d8688ff90da665c0

data/lib/dor/models/describable.rb

@@ -157,10 +157,17 @@ module Dor
 
     def to_solr(solr_doc=Hash.new, *args)
       super solr_doc, *args
-      # initialize multivalue targts if necessary
-      %w[ metadata_format_ssim sw_language_tesim sw_genre_tesim sw_format_tesim
-          sw_subject_temporal_tesim sw_subject_geographic_tesim mods_typeOfResource_tesim].each { |key|
-        solr_doc[key] ||= []
+      mods_sources = {
+        'sw_language_tesim'           => :sw_language_facet,
+        'sw_genre_tesim'              => :sw_genre,
+        'sw_format_tesim'             => :format_main,   # basically sw_typeOfResource_tesim
+        'sw_subject_temporal_tesim'   => :era_facet,
+        'sw_subject_geographic_tesim' => :geographic_facet,
+        'mods_typeOfResource_tesim'   => [:term_values, :typeOfResource]
+      }
+      keys = mods_sources.keys.concat(%w[ metadata_format_ssim ])
+      keys.each { |key|
+        solr_doc[key] ||= []     # initialize multivalue targts if necessary
       }
 
       solr_doc["metadata_format_ssim"] << self.metadata_format
@@ -185,15 +192,7 @@ module Dor
 
       begin
         mods = self.stanford_mods
-        sources = {
-          'sw_language_tesim'           => :sw_language_facet,
-          'sw_genre_tesim'              => :sw_genre,
-          'sw_format_tesim'             => :format_main,   # basically sw_typeOfResource_tesim
-          'sw_subject_temporal_tesim'   => :era_facet,
-          'sw_subject_geographic_tesim' => :geographic_facet,
-          'mods_typeOfResource_tesim'   => [:term_values, :typeOfResource]
-        }
-        sources.each_pair do |solr_key, meth|
+        mods_sources.each_pair do |solr_key, meth|
           vals = meth.is_a?(Array) ? mods.send(meth.shift, *meth) : mods.send(meth)
           solr_doc[solr_key].push *vals unless (vals.nil? || vals.empty?)
           # asterisk to avoid multi-dimensional array: push values, not the array
@@ -202,6 +201,8 @@ module Dor
       end
       # some fields get explicit "(none)" placeholder values, mostly for faceting
       %w[sw_language_tesim sw_genre_tesim sw_format_tesim].each { |key| solr_doc[key] = ['(none)'] if solr_doc[key].empty? }
+      # otherwise remove empties
+      keys.each{ |key| solr_doc.delete(key) if (solr_doc[key].nil? || solr_doc[key].empty?)}
       solr_doc
     end
 

data/lib/dor/version.rb

@@ -1,3 +1,3 @@
 module Dor
-  VERSION = '5.0.1'
+  VERSION = '5.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.0.2
 platform: ruby
 authors:
 - Michael Klein
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -174,14 +174,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.7
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.7
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rsolr-ext
   requirement: !ruby/object:Gem::Requirement