Merge pull request #1995 from pulibrary/use_change_the_subject_gem

Use gem for ChangeTheSubject

Gemfile

@@ -12,6 +12,7 @@ gem 'capistrano-passenger'
 gem 'capistrano-rails', '~> 1.1.1'
 gem 'capistrano-rails-console', require: false
 gem 'capybara'
+gem 'change_the_subject', '~> 0.2.0'
 gem 'ddtrace', '~> 0.54.2'
 gem 'devise'
 gem 'faraday', '~> 1.0.1'

Gemfile.lock

@@ -183,6 +183,8 @@ GEM
     celluloid (0.16.0)
       timers (~> 4.0.0)
     cgi (0.3.1)
+    change_the_subject (0.2.0)
+      yaml
     childprocess (4.1.0)
     chronic (0.10.2)
     coderay (1.1.3)
@@ -598,6 +600,7 @@ DEPENDENCIES
   capistrano-rails (~> 1.1.1)
   capistrano-rails-console
   capybara
+  change_the_subject (~> 0.2.0)
   coveralls_reborn
   ddtrace (~> 0.54.2)
   devise

marc_to_solr/lib/traject_config.rb

@@ -3,6 +3,7 @@
 require 'traject/macros/marc21_semantics'
 require 'traject/macros/marc_format_classifier'
 require 'bundler/setup'
+require 'change_the_subject'
 require_relative './format'
 require_relative './princeton_marc'
 require_relative './geo'
@@ -11,7 +12,6 @@
 require_relative './solr_deleter'
 require_relative './access_facet_builder'
 require_relative './augment_the_subject'
-require_relative './change_the_subject'
 require_relative './pul_solr_json_writer'
 require 'stringex'
 require 'library_stdnums'
@@ -817,7 +817,7 @@
 to_field 'lc_subject_display' do |record, accumulator|
   subjects = process_hierarchy(record, '600|*0|abcdfklmnopqrtvxyz:610|*0|abfklmnoprstvxyz:611|*0|abcdefgklnpqstvxyz:630|*0|adfgklmnoprstvxyz:650|*0|abcvxyz:651|*0|avxyz')
   subjects = augment_the_subject.add_indigenous_studies(subjects)
-  subjects = ChangeTheSubject.fix(subjects)
+  subjects = ChangeTheSubject.fix(subject_terms: subjects)
   local_subjects = process_hierarchy(record, '650|*7|abcvxyz') { |field| local_heading? field }
   accumulator.replace(subjects | local_subjects)
 end
@@ -826,7 +826,7 @@
 to_field 'lc_subject_include_archaic_search_terms_index' do |record, accumulator|
   subjects = process_hierarchy(record, '600|*0|abcdfklmnopqrtvxyz:610|*0|abfklmnoprstvxyz:611|*0|abcdefgklnpqstvxyz:630|*0|adfgklmnoprstvxyz:650|*0|abcvxyz:651|*0|avxyz')
   new_subjects = augment_the_subject.add_indigenous_studies(subjects)
-  new_subjects = ChangeTheSubject.fix(new_subjects)
+  new_subjects = ChangeTheSubject.fix(subject_terms: new_subjects)
   combined_subjects = Array(subjects).concat(Array(new_subjects))&.uniq
   accumulator.replace(combined_subjects)
 end
@@ -860,7 +860,7 @@
 to_field 'subject_facet' do |record, accumulator|
   subjects = process_hierarchy(record, '600|*0|abcdfklmnopqrtvxyz:610|*0|abfklmnoprstvxyz:611|*0|abcdefgklnpqstvxyz:630|*0|adfgklmnoprstvxyz:650|*0|abcvxyz:651|*0|avxyz')
   subjects = augment_the_subject.add_indigenous_studies(subjects)
-  subjects = ChangeTheSubject.fix(subjects)
+  subjects = ChangeTheSubject.fix(subject_terms: subjects)
   additional_subject_thesauri = process_hierarchy(record, '650|*7|abcvxyz') { |field| siku_heading?(field) || local_heading?(field) || any_thesaurus_match?(field, %w[homoit]) }
   genres = process_hierarchy(record, '655|*7|avxyz') { |field| any_thesaurus_match? field, %w[lcgft aat rbbin rbgenr rbmscv rbpap rbpri rbprov rbpub rbtyp homoit] }
   accumulator.replace([subjects, additional_subject_thesauri, genres].flatten)
@@ -892,7 +892,7 @@
 to_field 'subject_topic_facet' do |record, accumulator|
   subjects = process_subject_topic_facet(record)
   subjects = augment_the_subject.add_indigenous_studies(subjects)
-  subjects = ChangeTheSubject.fix(subjects)
+  subjects = ChangeTheSubject.fix(subject_terms: subjects)
   accumulator.replace(subjects)
 end