Merge pull request #471 from sul-dlss/revert-indexers#457,461

Revert indexers work from #461
sul-dlss-deprecated · Aug 27, 2020 · ec81bb6 · ec81bb6
2 parents 16025cd + a604518
commit ec81bb6
Show file tree

Hide file tree

Showing 48 changed files with 5 additions and 2,372 deletions.
diff --git a/Gemfile b/Gemfile
@@ -54,7 +54,6 @@ group :development, :test do
   gem 'rubocop', '~> 0.58.1'
   # gem 'rubocop-rspec', '~> 1.5'
   gem 'rails-controller-testing'
-  gem 'webmock'
 end
 
 group :development do

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -154,8 +154,6 @@ GEM
     config (2.2.1)
       deep_merge (~> 1.2, >= 1.2.1)
       dry-validation (~> 1.0, >= 1.0.0)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
     crass (1.0.6)
     daemons (1.3.1)
     deep_merge (1.2.1)
@@ -280,7 +278,6 @@ GEM
     haml (5.1.2)
       temple (>= 0.8.0)
       tilt
-    hashdiff (1.0.1)
     honeybadger (4.7.2)
     hooks (0.4.1)
       uber (~> 0.0.14)
@@ -488,7 +485,6 @@ GEM
       mime-types
       nokogiri
       rest-client
-    safe_yaml (1.0.5)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
@@ -557,10 +553,6 @@ GEM
       i18n
     warden (1.2.8)
       rack (>= 2.0.6)
-    webmock (3.8.3)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-      hashdiff (>= 0.4.0, < 2.0.0)
     websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -623,7 +615,6 @@ DEPENDENCIES
   sqlite3 (~> 1.3.13)
   uglifier (>= 1.0.3)
   validates_email_format_of
-  webmock
   whenever (~> 0.9)
 
 BUNDLED WITH

diff --git a/app/controllers/hydrus_solr_controller.rb b/app/controllers/hydrus_solr_controller.rb
@@ -44,8 +44,7 @@ def reindex
       render(plain: msg)
     elsif is_hydrus_object(obj)
       # It's a Hydrus object: re-solrize it and render the SOLR document.
-      indexer = Indexer.for(obj)
-      solr_doc = indexer.to_solr
+      solr_doc = obj.to_solr
       solr.add(solr_doc, add_attributes: { commitWithin: 5000 })
       msg = "#{msg}: updated SOLR index: class=#{obj.class}"
       index_logger.info(msg)

diff --git a/app/indexers/administrative_metadata_datastream_indexer.rb b/app/indexers/administrative_metadata_datastream_indexer.rb
diff --git a/app/indexers/administrative_tag_indexer.rb b/app/indexers/administrative_tag_indexer.rb
diff --git a/app/indexers/composite_indexer.rb b/app/indexers/composite_indexer.rb
diff --git a/app/indexers/content_metadata_datastream_indexer.rb b/app/indexers/content_metadata_datastream_indexer.rb
diff --git a/app/indexers/data_indexer.rb b/app/indexers/data_indexer.rb
diff --git a/app/indexers/default_object_rights_datastream_indexer.rb b/app/indexers/default_object_rights_datastream_indexer.rb
diff --git a/app/indexers/describable_indexer.rb b/app/indexers/describable_indexer.rb
diff --git a/app/indexers/descriptive_metadata_datastream_indexer.rb b/app/indexers/descriptive_metadata_datastream_indexer.rb
diff --git a/app/indexers/embargo_metadata_datastream_indexer.rb b/app/indexers/embargo_metadata_datastream_indexer.rb