dor-services 5.17.3 → 5.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 909b3c0e3cd70327c8c654a683fcff6104e65ccf
-  data.tar.gz: 16aec03de432570223cf31f8f70e24ae37323517
+  metadata.gz: d2d0fea02b55ee4906b57a7f1ec29d281cd4441a
+  data.tar.gz: 87963a5b75e157f4bb9bfd3aadefaf77b1945707
 SHA512:
-  metadata.gz: 3ffec7bd43758242bd733c224e8da84cabd1ef97d5ace802602405cf89d11208d150ea206eb2767f637769bd4ebd780118d0d2301cd690ad0c3c3587543b7d54
-  data.tar.gz: 5e8ef10484c3df919d0a2a30d542697c1e0849ec9a8e4b9f68bb015b4bdaddac84e11a9c6ae54d3dbf85ddcd0fd0c7044d3b76f56db9f2d291a7d207be555924
+  metadata.gz: 3d97aa054071249c9980d50c382823395a8b1deaa0a76241166bb5d0c1d903e5a6b6d0cd619a6bb881d64907ac07ef7beba7f6efda267dc1d55c852a62099d6b
+  data.tar.gz: f5c4680e39daa95b119771e1c6c0006b7e3189552637d4b20650008b2e5697d4b2c179f2ca85f6f518cb25532226b828e0fcf1039518e9546324c79ee70d9b4c

data/config/config_defaults.yml

@@ -9,13 +9,6 @@
   :key_pass: ""
 :fedora:
   :url:
-  :safeurl:
-:stomp:
-  :host:
-  :user: ""
-  :password: ""
-  :port: 61613
-  :client_id: 'dor-services'
 :solr:
   :url:
   :opts: {}
@@ -23,8 +16,6 @@
 :metadata:
   :catalog:
     :url:
-  :exist:
-    :url:
 :sdr:
   :local_workspace_root: /dor/workspace
   :local_export_home: /dor/export
@@ -40,8 +31,6 @@
   :rest_url: ""
 :stacks:
   :local_workspace_root: /dor
-  :storage_root: /stacks
-  :document_cache_storage_root:
   :host:
   :user:
   :document_cache_host:
@@ -49,7 +38,7 @@
   :local_stacks_root: /stacks
   :local_document_cache_root: /purl/document_cache
   :url:
-  :iiif_profile:
+  :iiif_profile: 'http://iiif.io/api/image/2/level1.json'
 :suri:
   :pass:
   :id_namespace: druid
@@ -69,3 +58,10 @@
   :log: 'log/indexing_svc.log'
   :log_date_format_str: '%Y-%m-%d %H:%M:%S.%L'
   :log_rotation_interval: 'daily'
+:goobi:
+  :url:
+  :dpg_workflow_name: 'goobiWF'
+  :default_goobi_workflow_name: 'Example_Workflow'
+  :max_tries: 3
+  :max_sleep_seconds: 20
+  :base_sleep_seconds: 2

data/config/dev_console_env.rb.example

@@ -30,7 +30,6 @@ Dor::Config.configure do
     document_cache_host 'purl-dev.stanford.edu'
     document_cache_user ''
     local_workspace_root '/dor/workspace'
-    storage_root '/stacks'
     host 'host'
     user ''
     local_stacks_root '/stacks'

data/lib/dor-services.rb

@@ -1,6 +1,7 @@
 require 'active_fedora'
 require 'active_fedora/version'
 require 'active_support/core_ext/module/attribute_accessors'
+require 'active_support/core_ext/object/blank'
 require 'modsulator'
 require 'dor/utils/sdr_client'
 
@@ -144,11 +145,6 @@ module Dor
   autoload :ResetWorkspaceService,     'dor/services/reset_workspace_service'
   autoload :CleanupResetService,       'dor/services/cleanup_reset_service'
 
-  # Versioning Classes
-  module Versioning
-    autoload :FileInventoryDifference, 'dor/versioning/file_inventory_difference'
-  end
-
   # Workflow Classes
   module Workflow
     autoload :Graph,    'dor/workflow/graph'

data/lib/dor/config.rb

@@ -1,6 +1,5 @@
 require 'confstruct/configuration'
 require 'rsolr'
-require 'stomp'
 require 'yaml'
 
 module Dor
@@ -72,10 +71,6 @@ module Dor
         :sdr => {
           :rest_client => Confstruct.deferred { |c| config.make_rest_client c.url, c.cert_file, c.key_file, c.key_pass }
         },
-        :stomp => {
-          :connection => Confstruct.deferred { |c| Stomp::Connection.new c.user, c.password, c.host, c.port, true, 5, { 'client-id' => c.client_id }},
-          :client => Confstruct.deferred { |c| Stomp::Client.new c.user, c.password, c.host, c.port }
-        },
         :workflow => {
           :client => Confstruct.deferred do |c|
             Dor::WorkflowService.configure c.url, logger: c.client_logger, timeout: c.timeout, dor_services_url: config.dor_services.url

data/lib/dor/datastreams/rights_metadata_ds.rb

@@ -183,17 +183,17 @@ module Dor
 
       # 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', 'world_qualified'].include? rights_desc }
-      solr_doc['rights_descriptions_ssim'] << 'dark (file)' if dra.index_elements[:terms].include? 'none_read_file'
+      solr_doc['rights_descriptions_ssim'] -= ['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] 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?
+      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 { |val| val.nil? || val == '' }.flatten unless solr_doc[key].nil?
+        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, :string, [:stored_sortable])
 
@@ -201,9 +201,9 @@ module Dor
     end
 
     def use_license
-      return creative_commons unless ['', nil].include?(creative_commons)
-      return open_data_commons unless ['', nil].include?(open_data_commons)
-      ''
+      return creative_commons unless creative_commons.blank?
+      return open_data_commons unless open_data_commons.blank?
+      nil
     end
 
     # maintain AF < 8 indexing behavior

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

@@ -18,10 +18,12 @@ module Dor
     # @param [Nokogiri::XML::Document] content Nokogiri descMetadata document (overriding internal data)
     # @param [boolean] ns_aware namespace awareness toggle for from_nk_node()
     def stanford_mods(content = nil, ns_aware = true)
-      m = Stanford::Mods::Record.new
-      desc = content.nil? ? descMetadata.ng_xml : content
-      m.from_nk_node(desc.root, ns_aware)
-      m
+      @stanford_mods ||= begin
+        m = Stanford::Mods::Record.new
+        desc = content.nil? ? descMetadata.ng_xml : content
+        m.from_nk_node(desc.root, ns_aware)
+        m
+      end
     end
 
     def fetch_descMetadata_datastream
@@ -198,68 +200,74 @@ module Dor
 
     def to_solr(solr_doc = {}, *args)
       solr_doc = super solr_doc, *args
+      add_metadata_format_to_solr_doc(solr_doc)
+      add_dc_to_solr_doc(solr_doc)
+      add_mods_to_solr_doc(solr_doc)
+    end
+
+    def add_metadata_format_to_solr_doc(solr_doc)
+      solr_doc['metadata_format_ssim'] ||= []
+      solr_doc['metadata_format_ssim'] += ['mods']
+    end
+
+    def add_dc_to_solr_doc(solr_doc)
+      dc_doc = generate_dublin_core(include_collection_as_related_item: false)
+      # we excluding the generated collection relation here; we instead get the collection
+      # title from Dor::Identifiable.
+      dc_doc.xpath('/oai_dc:dc/*', oai_dc: XMLNS_OAI_DC).each do |node|
+        add_solr_value(solr_doc, "public_dc_#{node.name}", node.text, :string, [:stored_searchable])
+      end
+      creator = ''
+      dc_doc.xpath('//dc:creator', dc: XMLNS_DC).each do |node|
+        creator = node.text
+      end
+      title = ''
+      dc_doc.xpath('//dc:title', dc: XMLNS_DC).each do |node|
+        title = node.text
+      end
+      creator_title = creator + title
+      add_solr_value(solr_doc, 'creator_title', creator_title, :string, [:stored_sortable])
+    rescue CrosswalkError => e
+      Dor.logger.warn "Cannot index #{pid}.descMetadata: #{e.message}"
+    end
+
+    def add_mods_to_solr_doc(solr_doc)
       mods_sources = {
-        'sw_display_title_tesim'      => :sw_title_display,
-        'sw_author_ssim'              => :main_author_w_date,
-        'sw_author_tesim'             => :main_author_w_date,
-        'sw_author_sort_ssi'          => :sw_sort_author,
-        'sw_language_ssim'            => :sw_language_facet,
-        'sw_language_tesim'           => :sw_language_facet,
-        'sw_genre_ssim'               => :sw_genre,
-        'sw_genre_tesim'              => :sw_genre,
-        'sw_format_ssim'              => :format_main,   # basically sw_typeOfResource_ssim
-        'sw_format_tesim'             => :format_main,   # basically sw_typeOfResource_tesim
-        'sw_topic_ssim'               => :topic_facet,
-        'sw_topic_tesim'              => :topic_facet,
-        'sw_subject_temporal_ssim'    => :era_facet,
-        'sw_subject_temporal_tesim'   => :era_facet,
-        'sw_subject_geographic_ssim'  => :geographic_facet,
-        'sw_subject_geographic_tesim' => :geographic_facet,
-        'mods_typeOfResource_ssim'    => [:term_values, :typeOfResource],
-        '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
+        sw_title_display: %w(sw_display_title_tesim),
+        main_author_w_date: %w(sw_author_ssim sw_author_tesim),
+        sw_sort_author: %w(sw_author_sort_ssi),
+        sw_language_facet: %w(sw_language_ssim sw_language_tesim),
+        sw_genre: %w(sw_genre_ssim sw_genre_tesim),
+        format_main: %w(sw_format_ssim sw_format_tesim),
+        topic_facet: %w(sw_topic_ssim sw_topic_tesim),
+        era_facet: %w(sw_subject_temporal_ssim sw_subject_temporal_tesim),
+        geographic_facet: %w(sw_subject_geographic_ssim sw_subject_geographic_tesim),
+        [:term_values, :typeOfResource] => %w(mods_typeOfResource_ssim mods_typeOfResource_tesim),
+        pub_year_sort_str: %w(sw_pub_date_sort_ssi),
+        pub_year_int: %w(sw_pub_date_sort_isi),
+        pub_year_display_str: %w(sw_pub_date_facet_ssi)
       }
 
-      solr_doc['metadata_format_ssim'] << 'mods'
-      begin
-        dc_doc = generate_dublin_core(include_collection_as_related_item: false)
-        # we excluding the generated collection relation here; we instead get the collection
-        # title from Dor::Identifiable.
-        dc_doc.xpath('/oai_dc:dc/*', oai_dc: XMLNS_OAI_DC).each do |node|
-          add_solr_value(solr_doc, "public_dc_#{node.name}", node.text, :string, [:stored_searchable])
-        end
-        creator = ''
-        dc_doc.xpath('//dc:creator', dc: XMLNS_DC).each do |node|
-          creator = node.text
-        end
-        title = ''
-        dc_doc.xpath('//dc:title', dc: XMLNS_DC).each do |node|
-          title = node.text
+      mods_sources.each_pair do |meth, solr_keys|
+        vals = meth.is_a?(Array) ? stanford_mods.send(meth.shift, *meth) : stanford_mods.send(meth)
+
+        next if vals.nil? || (vals.respond_to?(:empty?) && vals.empty?)
+
+        solr_keys.each do |key|
+          solr_doc[key] ||= []
+          solr_doc[key].push *vals
         end
-        creator_title = creator + title
-        add_solr_value(solr_doc, 'creator_title', creator_title, :string, [:stored_sortable])
-      rescue CrosswalkError => e
-        Dor.logger.warn "Cannot index #{pid}.descMetadata: #{e.message}"
+        # asterisk to avoid multi-dimensional array: push values, not the array
       end
 
-      begin
-        mods = stanford_mods
-        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
-        end
-        solr_doc['sw_pub_date_sort_ssi' ] = mods.pub_year_sort_str  # e.g. '0800'
-        solr_doc['sw_pub_date_sort_isi' ] = mods.pub_year_int  # e.g. '0800'
-        solr_doc['sw_pub_date_facet_ssi'] = mods.pub_year_display_str # e.g. '9th century'
+      # convert multivalued fields to single value
+      %w(sw_pub_date_sort_ssi sw_pub_date_sort_isi sw_pub_date_facet_ssi).each do |key|
+        solr_doc[key] = solr_doc[key].first unless solr_doc[key].nil?
       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?}
+      %w(sw_language_tesim sw_genre_tesim sw_format_tesim).each do |key|
+        solr_doc[key] = ['(none)'] if solr_doc[key].nil? || solr_doc[key].empty?
+      end
       solr_doc
     end
 

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

@@ -174,19 +174,19 @@ module Dor
     end
 
     def use_license
-      return creative_commons_license unless ['', nil].include?(creative_commons_license)
-      return open_data_commons_license unless ['', nil].include?(open_data_commons_license)
-      ''
+      return creative_commons_license unless creative_commons_license.blank?
+      return open_data_commons_license unless open_data_commons_license.blank?
+      nil
     end
     def use_license_uri
-      return defaultObjectRights.creative_commons.uri.first unless ['', nil].include?(defaultObjectRights.creative_commons.uri)
-      return defaultObjectRights.open_data_commons.uri.first unless ['', nil].include?(defaultObjectRights.open_data_commons.uri)
-      ''
+      return defaultObjectRights.creative_commons.uri.first unless defaultObjectRights.creative_commons.uri.blank?
+      return defaultObjectRights.open_data_commons.uri.first unless defaultObjectRights.open_data_commons.uri.blank?
+      nil
     end
     def use_license_human
-      return creative_commons_license_human unless ['', nil].include?(creative_commons_license_human)
-      return open_data_commons_license_human unless ['', nil].include?(open_data_commons_license_human)
-      ''
+      return creative_commons_license_human unless creative_commons_license_human.blank?
+      return open_data_commons_license_human unless open_data_commons_license_human.blank?
+      nil
     end
 
     def creative_commons_license=(use_license_machine)

data/lib/dor/version.rb

@@ -1,3 +1,3 @@
 module Dor
-  VERSION = '5.17.3'.freeze
+  VERSION = '5.18.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 5.17.3
+  version: 5.18.0
 platform: ruby
 authors:
 - Michael Klein
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-22 00:00:00.000000000 Z
+date: 2016-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora