dor-services 9.3.0 → 9.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5015214a6f687ad0a64a9ea35914ac2984cf7efbd16cf7e60baea93f306d4d2f
-  data.tar.gz: 279ee95befcb33f476fde1d5f159c8a45b4b6d3333ef367a444bc6a076900401
+  metadata.gz: 496d07425ebd926eb69390d391aae0adfa646e365559152389b6ab75bd8c6f83
+  data.tar.gz: d76539bcc0b0516998343292cde5679071cb4cab7e8e7b6c3838801ac8158dfa
 SHA512:
-  metadata.gz: 466bea3e00aad80400d0e7be95c28275a1396be4ba139fed6f1b41f6d7f19edd1976dbc7f091ff1ecfd101276d491ebb48a9b91069889a845abed9a438094eaa
-  data.tar.gz: f34079d71a227261b7d9d587b9501ff4fc537adada8a69c0b520bd002f0fde2737e0e632b376b2f191bb527d875887bbda0536ca0b6f95b9835273f1e2f6df08
+  metadata.gz: 70cc7de352cf5b9dfa40da2e54d29c016e3d04f30736a1775cb8c302d0cd77b6f7250d29f13a43ae536c1dabc2e9ae56ab38d1bba6091e92497b32decac965c8
+  data.tar.gz: da9531081f100de69b0cf6af3e5900ff532128245a00c47c4f618d19209c00b1ab7a10d878ad242b57913e9b3c7f2b4db8bb01d66191183bafdcf4a1acc815c9

data/lib/dor/datastreams/identity_metadata_ds.rb

@@ -160,37 +160,6 @@ module Dor
       return_hash
     end
 
-    def to_solr(solr_doc = {}, *args)
-      solr_doc = super(solr_doc, *args)
-
-      if digital_object.respond_to?(:profile)
-        digital_object.profile.each_pair do |property, value|
-          add_solr_value(solr_doc, property.underscore, value, (property =~ /Date/ ? :date : :symbol), [:stored_searchable])
-        end
-      end
-
-      if sourceId.present?
-        (name, id) = sourceId.split(/:/, 2)
-        add_solr_value(solr_doc, 'dor_id', id, :symbol, [:stored_searchable])
-        add_solr_value(solr_doc, 'identifier', sourceId, :symbol, [:stored_searchable])
-        add_solr_value(solr_doc, 'source_id', sourceId, :symbol, [])
-      end
-      otherId.compact.each do |qid|
-        # this section will solrize barcode and catkey, which live in otherId
-        (name, id) = qid.split(/:/, 2)
-        add_solr_value(solr_doc, 'dor_id', id, :symbol, [:stored_searchable])
-        add_solr_value(solr_doc, 'identifier', qid, :symbol, [:stored_searchable])
-        add_solr_value(solr_doc, "#{name}_id", id, :symbol, [])
-      end
-
-      solr_doc
-    end
-
-    # maintain AF < 8 indexing behavior
-    def prefix
-      ''
-    end
-
     private
 
     # Convert one release element into a Hash

data/lib/dor/datastreams/rights_metadata_ds.rb

@@ -144,73 +144,6 @@ module Dor
       @dra_object = nil # until TODO complete, we'll expect to have to reparse after modification
     end
 
-    def to_solr(solr_doc = {}, *args)
-      solr_doc = super(solr_doc, *args)
-      dra = dra_object
-      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'] -= %w[access_restricted access_restricted_qualified world_qualified]
-      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] unless dra.index_elements[:obj_locations].blank?
-      solr_doc['file_rights_locations_ssim'] = dra.index_elements[:file_locations] unless dra.index_elements[:file_locations].blank?
-      solr_doc['obj_rights_agents_ssim'] = dra.index_elements[:obj_agents] unless dra.index_elements[:obj_agents].blank?
-      solr_doc['file_rights_agents_ssim'] = dra.index_elements[:file_agents] unless dra.index_elements[:file_agents].blank?
-
-      # suppress empties
-      %w(use_statement_ssim copyright_ssim).each do |key|
-        solr_doc[key] = solr_doc[key].reject(&:blank?).flatten unless solr_doc[key].nil?
-      end
-      add_solr_value(solr_doc, 'use_license_machine', use_license.first, :string, [:stored_sortable])
-      add_solr_value(solr_doc, 'use_licenses_machine', use_license, :symbol, [:stored_searchable])
-
-      solr_doc
-    end
-
     def use_license
       use_license = []
       use_license += Array(creative_commons)
@@ -219,11 +152,6 @@ module Dor
       use_license.reject(&:blank?)
     end
 
-    # maintain AF < 8 indexing behavior
-    def prefix
-      ''
-    end
-
     def rights
       xml = ng_xml
       if xml.search('//rightsMetadata/access[@type=\'read\']/machine/group').length == 1

data/lib/dor/models/admin_policy_object.rb

@@ -7,7 +7,7 @@ module Dor
     has_metadata name: 'administrativeMetadata', type: Dor::AdministrativeMetadataDS, label: 'Administrative Metadata'
     has_metadata name: 'roleMetadata',           type: Dor::RoleMetadataDS,           label: 'Role Metadata'
     has_metadata name: 'defaultObjectRights',    type: Dor::DefaultObjectRightsDS,    label: 'Default Object Rights'
-    belongs_to :agreement_object, property: :referencesAgreement, class_name: 'Dor::Item'
+    belongs_to :agreement_object, property: :referencesAgreement, class_name: 'Dor::Agreement'
 
     delegate :add_roleplayer, :purge_roles, :roles, to: :roleMetadata
     delegate :mods_title, :mods_title=, to: :descMetadata

data/lib/dor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dor
-  VERSION = '9.3.0'
+  VERSION = '9.4.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 9.3.0
+  version: 9.4.0
 platform: ruby
 authors:
 - Michael Klein
@@ -20,7 +20,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-23 00:00:00.000000000 Z
+date: 2020-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -483,7 +483,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby implmentation of DOR services used by the SULAIR Digital Library