dor-services 5.8.2 → 5.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6780a7a945647fee66a03d09d0078f0380e5b843
-  data.tar.gz: 2038417c3ca307187099e6d4a8b40e6f4b86d8cd
+  metadata.gz: 4e4fe1b937312d6f71a812a8ad3af0b93e00feb8
+  data.tar.gz: ffb4c41c9e24148d550d489ca1507cd622249049
 SHA512:
-  metadata.gz: e09e6078eb545cbcfba2e232c4e96c693d5864d194141afcbf6e703d96d15c283e3c77e32d57c4089ab0bf8c4f611bf15bd85d9ce3d4fe9e7b3158aad35f0928
-  data.tar.gz: b5824dfa9bd07fd22608ccb9434ed2f114e493de73c8e5a788f51a20133b1370dc14d4ee137f5bc42a35220325c4f818b7ef5910fe534fddadc6d9f8cc652d17
+  metadata.gz: 9837ee5cf8ed557e44f703b1c5384f3881088d5642c2a9ee8893fc37f43e9f58ede220bd0040f291a7b9bccb562ffef9367bc67dccd34d804475a25ae39d598f
+  data.tar.gz: 1dbb913bf39909c48b72986b41bf7bae31bc8a72a771e0fddd8d0d2178fe5405cc22265bf40db095e4513ab124b98ff3029fa38dc1cda63bdb7e2d915f7c4d68

data/lib/dor/datastreams/rights_metadata_ds.rb

@@ -101,6 +101,57 @@ module Dor
       solr_doc['rights_primary_ssi'] = dra.index_elements[:primary]
       solr_doc['rights_errors_ssim'] = dra.index_elements[:errors] if dra.index_elements[:errors].size > 0
       solr_doc['rights_characteristics_ssim'] = dra.index_elements[:terms] if dra.index_elements[:terms].size > 0
+
+      solr_doc['rights_descriptions_ssim'] = [
+        dra.index_elements[:primary],
+
+        (dra.index_elements[:obj_locations_qualified] || []).map do |rights_info|
+          rule_suffix = rights_info[:rule] ? " (#{rights_info[:rule]})" : ''
+          "location: #{rights_info[:location]}#{rule_suffix}"
+        end,
+        (dra.index_elements[:file_locations_qualified] || []).map do |rights_info|
+          rule_suffix = rights_info[:rule] ? " (#{rights_info[:rule]})" : ''
+          "location: #{rights_info[:location]} (file)#{rule_suffix}"
+        end,
+
+        (dra.index_elements[:obj_agents_qualified] || []).map do |rights_info|
+          rule_suffix = rights_info[:rule] ? " (#{rights_info[:rule]})" : ''
+          "agent: #{rights_info[:agent]}#{rule_suffix}"
+        end,
+        (dra.index_elements[:file_agents_qualified] || []).map do |rights_info|
+          rule_suffix = rights_info[:rule] ? " (#{rights_info[:rule]})" : ''
+          "agent: #{rights_info[:agent]} (file)#{rule_suffix}"
+        end,
+
+        (dra.index_elements[:obj_groups_qualified] || []).map do |rights_info|
+          rule_suffix = rights_info[:rule] ? " (#{rights_info[:rule]})" : ''
+          "#{rights_info[:group]}#{rule_suffix}"
+        end,
+        (dra.index_elements[:file_groups_qualified] || []).map do |rights_info|
+          rule_suffix = rights_info[:rule] ? " (#{rights_info[:rule]})" : ''
+          "#{rights_info[:group]} (file)#{rule_suffix}"
+        end,
+
+        (dra.index_elements[:obj_world_qualified] || []).map do |rights_info|
+          rule_suffix = rights_info[:rule] ? " (#{rights_info[:rule]})" : ''
+          "world#{rule_suffix}"
+        end,
+        (dra.index_elements[:file_world_qualified] || []).map do |rights_info|
+          rule_suffix = rights_info[:rule] ? " (#{rights_info[:rule]})" : ''
+          "world (file)#{rule_suffix}"
+        end
+      ].flatten.uniq
+
+      # these two values are returned by index_elements[:primary], but are just a less granular version of
+      # what the other more specific fields return, so discard them
+      solr_doc['rights_descriptions_ssim'].reject! { |rights_desc| ['access_restricted', 'access_restricted_qualified'].include? rights_desc }
+      solr_doc['rights_descriptions_ssim'] << 'dark (file)' if dra.index_elements[:terms].include? 'none_read_file'
+
+      solr_doc['obj_rights_locations_ssim'] = dra.index_elements[:obj_locations] if !dra.index_elements[:obj_locations].blank?
+      solr_doc['file_rights_locations_ssim'] = dra.index_elements[:file_locations] if !dra.index_elements[:file_locations].blank?
+      solr_doc['obj_rights_agents_ssim'] = dra.index_elements[:obj_agents] if !dra.index_elements[:obj_agents].blank?
+      solr_doc['file_rights_agents_ssim'] = dra.index_elements[:file_agents] if !dra.index_elements[:file_agents].blank?
+
       # suppress empties
       %w(use_statement_ssim copyright_ssim).each do |key|
         solr_doc[key] = solr_doc[key].reject { |val| val.nil? || val == '' }.flatten unless solr_doc[key].nil?

data/lib/dor/version.rb

@@ -1,3 +1,3 @@
 module Dor
-  VERSION = '5.8.2'.freeze
+  VERSION = '5.9.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 5.8.2
+  version: 5.9.0
 platform: ruby
 authors:
 - Michael Klein
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-06 00:00:00.000000000 Z
+date: 2016-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -323,7 +323,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -333,7 +333,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: lyber-utils
   requirement: !ruby/object:Gem::Requirement