dor-services 5.25.0 → 5.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46e3ff972a83b4179a404ade467d7faeb01d853a
-  data.tar.gz: 18ae1967c9357b69c59cd095070856eb8914b9b0
+  metadata.gz: 4ee1ac53d79f9351390da0d4cea40d8c02023b14
+  data.tar.gz: 9fffeb1b5b2a23035f6434d13ac1ebd49aa495a3
 SHA512:
-  metadata.gz: a444e2762bf1be1c121a3745ad625be500fdc5b05b01e90ed243795a9fabfd02652a4f8e1cff95ea3b0c30acf5b51eff79bb49363469293ca4f071af985e3f2f
-  data.tar.gz: 6276d8db063539fc266a972ba7f01a050fd1469dc45da97e8186f7320db1b7735eb98f413fe87a914d323f16e49d6770c9f5fc5bb975e962b93b4cd5d7143151
+  metadata.gz: 4338c7285c6cb9a6a5d92e1345b4fda6dcebcec0f8d5db3920501c29f847b0fbf4109feae1ed8f14beadd41f5aa98d72baaa2000a976803263869237d3df1c57
+  data.tar.gz: c8f10cc204a30e8b37df54025acd1e9f6d8bc0105b8e87f951a6e15adace82464ae716aadfebf4b95b9375c3b244dfd25d482ac0c51a12f5b480fbcf33e15f1e

data/lib/dor/datastreams/content_metadata_ds.rb

@@ -19,6 +19,7 @@ module Dor
           t.mimeType :path => { :attribute => 'mimeType' }, :index_as => [:displayable]
           t.dataType :path => { :attribute => 'dataType' }, :index_as => [:displayable]
           t.size     :path => { :attribute => 'size'     }, :index_as => [:displayable]    # , :data_type => :long
+          t.role     :path => { :attribute => 'role' },     :index_as => [:not_searchable]
           t.shelve   :path => { :attribute => 'shelve'   }, :index_as => [:not_searchable] # , :data_type => :boolean
           t.publish  :path => { :attribute => 'publish'  }, :index_as => [:not_searchable] # , :data_type => :boolean
           t.preserve :path => { :attribute => 'preserve' }, :index_as => [:not_searchable] # , :data_type => :boolean
@@ -85,6 +86,7 @@ module Dor
       shelved_size = 0
       counts = Hash.new(0)                # default count is zero
       resource_type_counts = Hash.new(0)  # default count is zero
+      file_roles = ::Set.new
       mime_types = ::Set.new
       first_shelved_image = nil
 
@@ -95,10 +97,12 @@ module Dor
           counts['content_file'] += 1
           preserved_size += file['size'].to_i if file['preserve'] == 'yes'
           shelved_size += file['size'].to_i if file['shelve'] == 'yes'
-          next unless file['shelve'] == 'yes'
-          counts['shelved_file'] += 1
-          first_shelved_image ||= file['id'] if file['id'] =~ /jp2$/
+          if file['shelve'] == 'yes'
+            counts['shelved_file'] += 1
+            first_shelved_image ||= file['id'] if file['id'] =~ /jp2$/
+          end
           mime_types << file['mimetype']
+          file_roles << file['role'] if file['role']
         end
       end
       solr_doc['content_type_ssim'              ] = doc.root['type']
@@ -109,6 +113,7 @@ module Dor
       solr_doc['preserved_size_dbtsi'           ] = preserved_size # double (trie) to support very large sizes
       solr_doc['shelved_size_dbtsi'             ] = shelved_size # double (trie) to support very large sizes
       solr_doc['resource_types_ssim'            ] = resource_type_counts.keys if resource_type_counts.size > 0
+      solr_doc['content_file_roles_ssim'        ] = file_roles.to_a if file_roles.size > 0
       resource_type_counts.each do |key, count|
         solr_doc["#{key}_resource_count_itsi"] = count
       end
@@ -145,6 +150,7 @@ module Dor
       end
       file_node['size'    ] = file[:size     ] if file[:size     ]
       file_node['mimetype'] = file[:mime_type] if file[:mime_type]
+      file_node['role'] = file[:role] if file[:role]
       file_node
     end
 
@@ -206,6 +212,7 @@ module Dor
           file_node.add_child(checksum_node)
         }
         file_node['size'] = file[:size] if file[:size]
+        file_node['role'] = file[:role] if file[:role]
       end
       ng_xml.search('//contentMetadata').first.add_child(node)
       node
@@ -235,12 +242,15 @@ module Dor
     # @param [String] publish
     # @param [String] shelve
     # @param [String] preserve
-    def update_attributes(file_name, publish, shelve, preserve)
+    def update_attributes(file_name, publish, shelve, preserve, attributes = {})
       self.ng_xml_will_change!
       file_node = ng_xml.search('//file[@id=\'' + file_name + '\']').first
       file_node['publish' ] = publish
       file_node['shelve'  ] = shelve
       file_node['preserve'] = preserve
+      attributes.each do |key, value|
+        file_node[key] = value
+      end
     end
 
     # @param file [Object] some hash-like file
@@ -260,7 +270,7 @@ module Dor
         checksum_node.content = file[algo]
       }
 
-      [:size, :shelve, :preserve, :publish].each { |x|
+      [:size, :shelve, :preserve, :publish, :role].each { |x|
         file_node[x.to_s] = file[x] if file[x]
       }
     end

data/lib/dor/models/concerns/contentable.rb

@@ -206,8 +206,8 @@ module Dor
     end
 
     # Clears RELS-EXT relationships, sets the isGovernedBy relationship to the SDR Graveyard APO
-    # @param [String] tag optional String of text that is concatenated to the identityMetadata/tag "Decomissioned : "
-    def decomission(tag)
+    # @param [String] tag optional String of text that is concatenated to the identityMetadata/tag "Decommissioned : "
+    def decommission(tag)
       # remove isMemberOf and isMemberOfCollection relationships
       clear_relationship :is_member_of
       clear_relationship :is_member_of_collection
@@ -223,6 +223,9 @@ module Dor
       add_tag "Decommissioned : #{tag}"
     end
 
+    alias_method :decomission, :decommission
+    deprecate decomission: 'Use decommission instead'
+
     # Adds a RELS-EXT constituent relationship to the given druid
     # @param [String] druid the parent druid of the constituent relationship
     #   e.g.: <fedora:isConstituentOf rdf:resource="info:fedora/druid:hj097bm8879" />

data/lib/dor/services/merge_service.rb

@@ -6,7 +6,7 @@ module Dor
       merge_service = Dor::MergeService.new primary_druid, secondary_druids, tag, logger
       merge_service.check_objects_editable
       merge_service.move_metadata_and_content
-      merge_service.decomission_secondaries
+      merge_service.decommission_secondaries
       # kick off commonAccessioning for the primary?
     end
 
@@ -58,11 +58,11 @@ module Dor
       end
     end
 
-    def decomission_secondaries
+    def decommission_secondaries
       @secondary_objs.each do |secondary_obj|
         begin
           @current_secondary = secondary_obj
-          @current_secondary.decomission @tag
+          @current_secondary.decommission @tag
           @current_secondary.save
 
           unshelve
@@ -70,11 +70,13 @@ module Dor
           Dor::CleanupService.cleanup_by_druid @current_secondary.pid
           Dor::Config.workflow.client.archive_active_workflow 'dor', @current_secondary.pid
         rescue => e
-          @logger.error "Unable to decomission #{@current_secondary.pid} with primary object #{@primary.pid}: #{e.inspect}"
+          @logger.error "Unable to decommission #{@current_secondary.pid} with primary object #{@primary.pid}: #{e.inspect}"
           @logger.error e.backtrace.join("\n")
         end
       end
     end
+    alias_method :decomission_secondaries, :decommission_secondaries
+    deprecate decomission_secondaries: 'Use decommission_secondaries instead'
 
     # Remove content from stacks
     # TODO: might set workflow status in future for robot to do

data/lib/dor/version.rb

@@ -1,3 +1,3 @@
 module Dor
-  VERSION = '5.25.0'.freeze
+  VERSION = '5.26.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 5.25.0
+  version: 5.26.0
 platform: ruby
 authors:
 - Michael Klein
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-25 00:00:00.000000000 Z
+date: 2018-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -684,7 +684,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Ruby implmentation of DOR services used by the SULAIR Digital Library