dor-services 4.25.1 → 5.0.0

data/lib/dor/services/merge_service.rb

@@ -27,7 +27,7 @@ module Dor
       unless @primary.allows_modification?
         raise Dor::Exception.new "Primary object is not editable: #{@primary.pid}"
       end
-      if ( non_editable = (@secondary_objs.detect {|obj| !obj.allows_modification? } ))
+      if ( non_editable = (@secondary_objs.detect {|obj| ! obj.allows_modification? } ))
         raise Dor::Exception.new "Secondary object is not editable: #{non_editable.pid}"
       end
     end

data/lib/dor/services/metadata_handlers/mdtoolkit_handler.rb

@@ -26,7 +26,7 @@ handler = Class.new do
     end
     case xml.root.name
     when 'msDesc' then xml.xpath('/msDesc/msIdentifier/collection').text
-    when 'mods'   then
+    when 'mods'   then 
       xml.root.add_namespace_definition('mods','http://www.loc.gov/mods/v3')
       xml.xpath('/mods:mods/mods:titleInfo[1]').xpath('mods:title|mods:nonSort').collect { |n| n.text }.join(' ').strip
     end
@@ -37,4 +37,4 @@ handler = Class.new do
   end
 end
 
-Dor::MetadataService.register(handler)
+Dor::MetadataService.register(handler)

data/lib/dor/services/metadata_service.rb

@@ -3,27 +3,27 @@ require 'cache'
 module Dor
 
   class MetadataError < Exception ; end
-
+  
 #  class MetadataHandler
-#
+#  
 #    def fetch(prefix, identifier)
 #      ### Return metadata for prefix/identifier combo
 #    end
-#
+#    
 #    def label(metadata)
 #      ### Return a Fedora-compatible label from the metadata format returned by #fetch
 #    end
-#
+#    
 #  end
-
+  
   class MetadataService
-
+    
     class << self
       @@cache = Cache.new(nil, nil, 250, 300)
-
+      
       def register(handler_class)
         ['fetch', 'label', 'prefixes'].each do |method|
-          unless handler_class.instance_methods.include?(method) or handler_class.instance_methods.include?(method.to_sym)
+          unless handler_class.instance_methods.include?(method) || handler_class.instance_methods.include?(method.to_sym) 
             raise TypeError, "Metadata handlers must define ##{method.to_s}"
           end
         end
@@ -31,23 +31,23 @@ module Dor
         handler.prefixes.each do |prefix|
           handlers[prefix.to_sym] = handler
         end
-        handler
+        return handler
       end
-
+      
       def known_prefixes
-        handlers.keys
+        return handlers.keys
       end
-
+      
       def can_resolve?(identifier)
         (prefix, identifier) = identifier.split(/:/,2)
         handlers.keys.include?(prefix.to_sym)
       end
-
+      
       # TODO: Return a prioritized list
       def resolvable(identifiers)
         identifiers.select { |identifier| self.can_resolve?(identifier) }
       end
-
+      
       def fetch(identifier)
         @@cache.fetch(identifier) do
           (prefix, identifier) = identifier.split(/:/,2)
@@ -61,24 +61,24 @@ module Dor
         handler = handler_for(prefix)
         handler.label(handler.fetch(prefix, identifier))
       end
-
+      
       def handler_for(prefix)
         handler = handlers[prefix.to_sym]
         if handler.nil?
           raise MetadataError, "Unkown metadata prefix: #{prefix}"
         end
-        handler
+        return handler
       end
-
+      
       private
       def handlers
         @handlers ||= {}
       end
-
+      
     end
-
+    
   end
-
+  
 end
 
 Dir[File.join(File.dirname(__FILE__),'metadata_handlers','*.rb')].each { |handler_file|

data/lib/dor/services/registration_service.rb

@@ -8,26 +8,25 @@ module Dor
       def register_object(params = {})
         Dor.ensure_models_loaded!
         [:object_type, :label].each do |required_param|
-          raise Dor::ParameterError, "#{required_param.inspect} must be specified in call to #{name}.register_object" unless params[required_param]
+          raise Dor::ParameterError, "#{required_param.inspect} must be specified in call to #{self.name}.register_object" unless params[required_param]
         end
-        metadata_source=params[:metadata_source]
+        metadata_source = params[:metadata_source]
         if params[:label].length<1 && (metadata_source=='label' || metadata_source=='none')
-          raise Dor::ParameterError, "label cannot be empty to call #{name}.register_object"
+          raise Dor::ParameterError, "label cannot be empty to call #{self.name}.register_object"
         end
         object_type = params[:object_type]
         item_class = Dor.registered_classes[object_type]
         raise Dor::ParameterError, "Unknown item type: '#{object_type}'" if item_class.nil?
 
         content_model = params[:content_model]
-        admin_policy = params[:admin_policy]
-        label = params[:label]
-        source_id = params[:source_id] || {}
-        other_ids = params[:other_ids] || {}
-        tags = params[:tags] || []
-        parent = params[:parent]
-        collection = params[:collection]
+        admin_policy  = params[:admin_policy]
+        label         = params[:label]
+        source_id     = params[:source_id] || {}
+        other_ids     = params[:other_ids] || {}
+        tags          = params[:tags] || []
+        parent        = params[:parent]
+        collection    = params[:collection]
         pid = nil
-        metadata_source=params[:metadata_source]
         if params[:pid]
           pid = params[:pid]
           existing_pid = SearchService.query_by_id(pid).first
@@ -42,7 +41,7 @@ module Dor
         if params[:rights]
           rights=params[:rights]
           unless ['world','stanford','dark','default','none'].include? rights
-            raise Dor::ParameterError,"Unknown rights setting" + rights + "when calling #{name}.register_object"
+            raise Dor::ParameterError, "Unknown rights setting '#{rights}' when calling #{self.name}.register_object"
           end
         end
 
@@ -54,14 +53,10 @@ module Dor
           end
         end
 
-        if (other_ids.has_key?(:uuid) || other_ids.has_key?('uuid')) == false
+        if (other_ids.has_key?(:uuid) or other_ids.has_key?('uuid')) == false
           other_ids[:uuid] = UUIDTools::UUID.timestamp_create.to_s
         end
-        short_label=label
-        if label.length>254
-          short_label=label[0,254]
-        end
-
+        short_label = label.length>254 ? label[0,254] : label
         apo_object = Dor.find(admin_policy, :lightweight => true)
         adm_xml = apo_object.administrativeMetadata.ng_xml
 
@@ -89,10 +84,10 @@ module Dor
         if collection
           new_item.add_collection(collection)
         end
-        if(rights && ['item','collection'].include?(object_type)  )
+        if (rights && ['item','collection'].include?(object_type))
           rights_xml=apo_object.defaultObjectRights.ng_xml
           new_item.datastreams['rightsMetadata'].content=rights_xml.to_s
-          new_item.set_read_rights(rights)
+          new_item.set_read_rights(rights) unless rights == 'default'    # already defaulted to default!
         end
         #create basic mods from the label
         if(metadata_source=='label')
@@ -104,24 +99,28 @@ module Dor
               }
             }
           }
-
-      ds.content=builder.to_xml
-
-      end
+          ds.content=builder.to_xml
+        end
 
         workflow_priority = params[:workflow_priority] ? params[:workflow_priority].to_i : 0
 
         Array(params[:seed_datastream]).each { |datastream_name| new_item.build_datastream(datastream_name) }
-        Array(params[:initiate_workflow]).each { |workflow_id| new_item.initialize_workflow(workflow_id, !new_item.new_object?, workflow_priority)}
+        Array(params[:initiate_workflow]).each { |workflow_id| new_item.initialize_workflow(workflow_id, 'dor', !new_item.new_object?, workflow_priority)}
 
         new_item.assert_content_model
+
+        new_item.class.ancestors.select { |x| x.respond_to? :to_class_uri }.each do |parent_class|
+          next if parent_class == ActiveFedora::Base
+          new_item.add_relationship(:has_model, parent_class.to_class_uri)
+        end
+
         new_item.save
         begin
           new_item.update_index if ::ENABLE_SOLR_UPDATES
         rescue StandardError => e
           Dor.logger.warn "Dor::RegistrationService.register_object failed to update solr index for #{new_item.pid}: #<#{e.class.name}: #{e.message}>"
         end
-        (new_item)
+        return(new_item)
       end
 
       def create_from_request(params)
@@ -159,7 +158,7 @@ module Dor
         }
         dor_params.delete_if { |k,v| v.nil? }
 
-        dor_obj = register_object(dor_params)
+        dor_obj = self.register_object(dor_params)
         pid = dor_obj.pid
         location = URI.parse(Dor::Config.fedora.safeurl.sub(/\/*$/,'/')).merge("objects/#{pid}").to_s
         reg_response = dor_params.dup.merge({ :location => location, :pid => pid })

data/lib/dor/services/reset_workspace_service.rb

@@ -4,32 +4,32 @@ module Dor
   class ResetWorkspaceService
 
     def self.reset_workspace_druid_tree(druid, version, workspace_root)
-
+      
       druid_tree_path = DruidTools::Druid.new(druid, workspace_root).pathname.to_s
-
-      raise "The archived directory #{druid_tree_path}_v#{version} already existed." if  File.exists?("#{druid_tree_path}_v#{version}")
-
-      if File.exists?(druid_tree_path)
+      
+      raise "The archived directory #{druid_tree_path}_v#{version} already existed." if  File.exists?("#{druid_tree_path}_v#{version}") 
+      
+      if File.exists?(druid_tree_path) 
         FileUtils.mv(druid_tree_path, "#{druid_tree_path}_v#{version}")
       end #Else is a truncated tree where we shouldn't do anything
 
     end
 
     def self.reset_export_bag(druid, version, export_root)
-
+      
       id = druid.split(':').last
       bag_dir = File.join(export_root, id)
 
-      raise "The archived bag #{bag_dir}_v#{version} already existed." if  File.exists?("#{bag_dir}_v#{version}")
-
-      if File.exists?(bag_dir)
+      raise "The archived bag #{bag_dir}_v#{version} already existed." if  File.exists?("#{bag_dir}_v#{version}") 
+      
+      if File.exists?(bag_dir) 
         FileUtils.mv(bag_dir, "#{bag_dir}_v#{version}")
-      end
-
-      if File.exists?("#{bag_dir}.tar")
+      end 
+      
+      if File.exists?("#{bag_dir}.tar") 
         FileUtils.mv("#{bag_dir}.tar", "#{bag_dir}_v#{version}.tar")
-      end
+      end 
     end
-
+        
   end
-end
+end

data/lib/dor/services/sdr_ingest_service.rb

@@ -6,7 +6,7 @@ module Dor
     # @param [Dor::Item] dor_item The representation of the digital object
     # @param [String] agreement_id  depreciated, included for backward compatability with common-accessoning
     # @return [void] Create the moab manifests, export data to a BagIt bag, kick off the SDR ingest workflow
-    def self.transfer(dor_item, agreement_id = nil)
+    def self.transfer(dor_item, agreement_id=nil)
       druid = dor_item.pid
       workspace = DruidTools::Druid.new(druid,Dor::Config.sdr.local_workspace_root)
       signature_catalog = get_signature_catalog(druid)
@@ -36,7 +36,7 @@ module Dor
       bagger.create_tagfiles
       verify_bag_structure(bag_dir)
       # Now bootstrap SDR workflow. but do not create the workflows datastream
-      dor_item.initialize_workflow('sdrIngestWF', false)
+      dor_item.initialize_workflow('sdrIngestWF', 'sdr', false)
     rescue Exception => e
       raise LyberCore::Exceptions::ItemError.new(druid, "Export failure", e)
     end
@@ -61,7 +61,7 @@ module Dor
       Config.sdr.datastreams.to_hash.each_pair do |ds_name, required|
         ds_name = ds_name.to_s
         metadata_file = metadata_dir.join("#{ds_name}.xml")
-        metadata_string = get_datastream_content(dor_item, ds_name, required)
+        metadata_string = self.get_datastream_content(dor_item, ds_name, required)
         metadata_file.open('w') { |f| f << metadata_string } if metadata_string
       end
       metadata_dir
@@ -74,7 +74,7 @@ module Dor
     #   If not found, return nil unless it is a required datastream in which case raise exception
     def self.get_datastream_content(dor_item, ds_name, required)
       ds = (ds_name == 'relationshipMetadata' ? 'RELS-EXT' : ds_name)
-      if dor_item.datastreams.keys.include?(ds) && !dor_item.datastreams[ds].new?
+      if dor_item.datastreams.keys.include?(ds) && ! dor_item.datastreams[ds].new?
         return dor_item.datastreams[ds].content
       elsif (required == 'optional')
         return nil

data/lib/dor/services/search_service.rb

@@ -5,18 +5,13 @@ module Dor
 
   class SearchService
 
-    include Solrizer::FieldNameMapper
     RISEARCH_TEMPLATE = "select $object from <#ri> where $object <dc:identifier> '%s'"
     @@index_version = nil
 
     class << self
 
       def index_version
-        if @@index_version.nil?
-          xsl_doc = Nokogiri::XML(File.read(File.expand_path('../../../gsearch/demoFoxmlToSolr.xslt',__FILE__)))
-          @@index_version = xsl_doc.at_xpath('/xsl:stylesheet/xsl:variable[@name="INDEXVERSION"]/text()').to_s
-        end
-        @@index_version
+        Dor::VERSION
       end
 
       def reindex(*pids)
@@ -73,7 +68,7 @@ module Dor
         result = JSON.parse(client["select?#{query_string}"].get)
       end
 
-      def query query, args = {}
+      def query query, args={}
         params = args.merge({ :q => query })
         params[:start] ||= 0
         resp = solr.find params
@@ -96,7 +91,7 @@ module Dor
         elsif id.is_a?(Array) # Two values: [ 'google', 'STANFORD_0123456789' ]
           id = id.join(':')
         end
-        q = %{#{solr_name 'identifier', :string}:"#{id}"}
+        q = %{#{Solrizer.solr_name 'identifier', :facetable}:"#{id}"}
         result = []
         resp = query(q, :fl => 'id', :rows => 1000) do |resp|
           result += resp.docs.collect { |doc| doc['id'] }
@@ -128,4 +123,4 @@ module Dor
 
   end
 
-end
+end

data/lib/dor/services/suri_service.rb

@@ -6,7 +6,7 @@ module Dor
     # If Dor::Config.suri.mint_ids is set to true, then this method
     # returns Config.suri.id_namespace:id_from_suri
     # Throws an exception if there were any problems
-    def self.mint_id quantity = nil
+    def self.mint_id quantity=nil
       want_array = quantity.is_a?(Numeric)
       quantity = 1 if quantity.nil?
       ids = []
@@ -20,13 +20,13 @@ module Dor
         resp = Nokogiri::XML(repo.next_pid :numPIDs => quantity)
         ids = resp.xpath('/pidList/pid').collect { |node| node.text }
       end
-      want_array ? ids : ids.first
+      return want_array ? ids : ids.first
 
 #    rescue Exception => e
 #      Rails.logger.error("Unable to mint id from suri: #{e.to_s}")
 #      raise e
     end
-
-
+  
+    
   end
-end
+end

data/lib/dor/services/technical_metadata_service.rb

@@ -99,7 +99,7 @@ module Dor
     #   The data is updated to the latest format.
     def self.get_dor_technical_metadata(dor_item)
       ds = "technicalMetadata"
-      if dor_item.datastreams.keys.include?(ds) && !dor_item.datastreams[ds].new?
+      if dor_item.datastreams.keys.include?(ds) and not dor_item.datastreams[ds].new?
         dor_techmd = dor_item.datastreams[ds].content
       else
         return nil
@@ -127,7 +127,7 @@ module Dor
     # @param [Array<String>] new_files The list of filenames for files that are either added or modifed since the previous version
     # @return [String] The technicalMetadata datastream for the new files of the new digital object version
     def self.get_new_technical_metadata(druid, new_files)
-      return nil if new_files.nil? || new_files.empty?
+      return nil if new_files.nil? or new_files.empty?
       workspace = DruidTools::Druid.new(druid, Dor::Config.sdr.local_workspace_root)
       content_dir = workspace.find_filelist_parent('content',new_files)
       temp_dir = workspace.temp_dir
@@ -223,3 +223,4 @@ module Dor
   end
 
 end
+

data/lib/dor/utils/ng_tidy.rb

@@ -1,11 +1,11 @@
 class Nokogiri::XML::Text
-
+  
   def normalize
-    content =~ /\S/ ? content.gsub(/\s+/,' ').strip : content
+    self.content =~ /\S/ ? self.content.gsub(/\s+/,' ').strip : self.content
   end
-
+  
   def normalize!
-    self.content = normalize
+    self.content = self.normalize
   end
 
 end
@@ -13,13 +13,13 @@ end
 class Nokogiri::XML::Node
 
   def normalize_text!
-    xpath('//text()').each { |t| t.normalize! }
+    self.xpath('//text()').each { |t| t.normalize! }
   end
-
+  
 end
 
 class Nokogiri::XML::Document
-
+  
   def prettify
     xslt = Nokogiri::XSLT <<-EOC
     <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
@@ -33,5 +33,5 @@ class Nokogiri::XML::Document
     EOC
     xslt.transform(self).to_xml
   end
-
-end
+  
+end