cul_scv_hydra 0.21.7 → 0.21.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c8a5353976107acfa707e314ae1afe6698b0326
-  data.tar.gz: a4d19b5fe5534469e8a1e310faff6d676b0ecc72
+  metadata.gz: 684ab352172474db992c51f360fe139a1e2fa20b
+  data.tar.gz: 40d435f777c2192215ecbe9c5c176e9eae3a8b90
 SHA512:
-  metadata.gz: 5d2a4d59be0b5fedbecf90119f5bb1bb48b8f4c9f730fe647ec5ff68ea5c763e07843616f7dc5cc6ac030c7023a262b73ececfe2ba9f9cdbfd74f17695414ee6
-  data.tar.gz: 8625b83c797cca591ac9b2f5bf789f82854ddfeec47771f7d3cac9230db57ec6225902210c65d679174b229021bf759a439ddb692a3b95d201ff73e4aa45de30
+  metadata.gz: 09d4bf1f2144d824113f83ec67e76ec429a9e79201d5d200a0e8d87cc9a92cfde0d8c507e1ab93fe3980a511ec828a8a0f529683d93da42de5d11bbee7bd2340
+  data.tar.gz: 964a5e44db39cf013413947d720e7a66beea2994f65a9cb21f85c3e1c48bdb37e704f74c1a4f109fb5e021113c66af8d03d81da644382b411796de0dcbf2138e

data/app/models/concerns/cul/scv/hydra/models/common.rb

@@ -113,6 +113,16 @@ module Cul::Scv::Hydra::Models::Common
     if (solr_doc["title_display_ssm"].length > 1)
       solr_doc["title_display_ssm"].uniq!
     end
+
+    if solr_doc["contributor_ssim"].present?
+      if solr_doc["contributor_ssim"].is_a?(Array)
+        solr_doc["contributor_first_si"] = solr_doc["contributor_ssim"].first
+      else
+        solr_doc["contributor_first_si"] = solr_doc["contributor_ssim"]
+      end
+    end
+
+
     solr_doc["format_ssi"] = [self.route_as]
 
     set_size_labels(solr_doc)

data/app/models/generic_resource.rb

@@ -70,10 +70,10 @@ class GenericResource < ::ActiveFedora::Base
       end
     end
 
-    solr_doc["fulltext_teim"] = []
+    solr_doc["fulltext_tesim"] = []
     unless self.datastreams["fulltext"].nil?
-      solr_doc["fulltext_teim"] << self.datastreams["fulltext"].content
-      solr_doc["fulltext_teim"] << solr_doc["title_display_ssm"] unless solr_doc["title_display_ssm"].nil? or solr_doc["title_display_ssm"].length == 0
+      solr_doc["fulltext_tesim"] << self.datastreams["fulltext"].content
+      solr_doc["fulltext_tesim"] << solr_doc["title_display_ssm"] unless solr_doc["title_display_ssm"].nil? or solr_doc["title_display_ssm"].length == 0
     end
 
     solr_doc

data/lib/cul_scv_hydra/indexer.rb

@@ -5,43 +5,51 @@ module Cul::Scv::Hydra::Indexer
       raise 'Please supply a pid (e.g. rake recursively_index_fedora_objects pid=ldpd:123)'
     end
 
-    unless ActiveFedora::Base.exists?(pid)
-      raise 'Could not find Fedora object with pid: ' + pid
-    end
+    begin
 
-    if pids_to_omit.present? && pids_to_omit.include?(pid)
-      puts 'Skipping topmost object in this set (' + pid + ') because it has been intentionally omitted...' if verbose_output
-    else
-      puts 'Indexing topmost object in this set (' + pid + ')...' if verbose_output
-      puts 'If this is a BagAggregator with a lot of members, this may take a while...' if verbose_output
+      unless ActiveFedora::Base.exists?(pid)
+        raise 'Could not find Fedora object with pid: ' + pid
+      end
 
-      yield pid
+      if pids_to_omit.present? && pids_to_omit.include?(pid)
+        puts 'Skipping topmost object in this set (' + pid + ') because it has been intentionally omitted...' if verbose_output
+      else
+        puts 'Indexing topmost object in this set (' + pid + ')...' if verbose_output
+        puts 'If this is a BagAggregator with a lot of members, this may take a while...' if verbose_output
 
-    end
+        yield pid
 
-    puts 'Recursively retreieving and indexing all members of ' + pid + '...'
+      end
 
-    unique_pids = Cul::Scv::Hydra::RisearchMembers.get_recursive_member_pids(pid, true)
+      puts 'Recursively retreieving and indexing all members of ' + pid + '...'
 
-    total_number_of_members = unique_pids.length
-    puts 'Recursive search found ' + total_number_of_members.to_s + ' members.' if verbose_output
+      unique_pids = Cul::Scv::Hydra::RisearchMembers.get_recursive_member_pids(pid, true)
 
-    if pids_to_omit.present?
-      unique_pids = unique_pids - pids_to_omit
       total_number_of_members = unique_pids.length
-      puts 'After checking against the list of omitted pids, the total number of objects to index will be: ' + total_number_of_members.to_s if verbose_output
-    end
+      puts 'Recursive search found ' + total_number_of_members.to_s + ' members.' if verbose_output
 
-    i = 1
-    if total_number_of_members > 0
-      unique_pids.each {|pid|
+      if pids_to_omit.present?
+        unique_pids = unique_pids - pids_to_omit
+        total_number_of_members = unique_pids.length
+        puts 'After checking against the list of omitted pids, the total number of objects to index will be: ' + total_number_of_members.to_s if verbose_output
+      end
 
-        puts 'Recursing on ' + i.to_s + ' of ' + total_number_of_members.to_s + ' members (' + pid + ')...' if verbose_output
+      i = 1
+      if total_number_of_members > 0
+        unique_pids.each {|pid|
 
-        yield pid
+          puts 'Recursing on ' + i.to_s + ' of ' + total_number_of_members.to_s + ' members (' + pid + ')...' if verbose_output
+
+          yield pid
+
+          i += 1
+        }
+      end
 
-        i += 1
-      }
+    rescue RestClient::Unauthorized => e
+      error_message = "Skipping #{pid} due to error: " + e.message + '.  Problem with Fedora object?'
+      puts error_message
+      logger.error error_message if defined?(logger)
     end
 
     puts 'Recursion complete!'

data/lib/cul_scv_hydra/version.rb

@@ -2,7 +2,7 @@
 module Cul
   module Scv
     module Hydra
-        VERSION = '0.21.7'
+        VERSION = '0.21.8'
         def self.version
           VERSION
         end

data/lib/cul_scv_hydra/version.rb~

@@ -2,7 +2,7 @@
 module Cul
   module Scv
     module Hydra
-        VERSION = '0.21.6'
+        VERSION = '0.21.7'
         def self.version
           VERSION
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cul_scv_hydra
 version: !ruby/object:Gem::Version
-  version: 0.21.7
+  version: 0.21.8
 platform: ruby
 authors:
 - Benjamin Armintor