From 5a2b3a7710bdfc7465864ada2fb4ed71e4cdb2f5 Mon Sep 17 00:00:00 2001
From: Justin Coyne <jcoyne@justincoyne.com>
Date: Tue, 31 May 2016 16:06:32 -0500
Subject: [PATCH] Stop indexing on active_fedora_model_ssi

We are using has_model_ssim for this capability
---
 lib/active_fedora/indexing_service.rb                         | 1 -
 .../config/solr/templates/solr/config/solrconfig.xml          | 1 -
 solr/config/solrconfig.xml                                    | 1 -
 spec/unit/indexing_spec.rb                                    | 4 ----
 spec/unit/query_spec.rb                                       | 4 ++--
 5 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/lib/active_fedora/indexing_service.rb b/lib/active_fedora/indexing_service.rb
index f69eb9072..3fe210923 100644
--- a/lib/active_fedora/indexing_service.rb
+++ b/lib/active_fedora/indexing_service.rb
@@ -38,7 +38,6 @@ def generate_solr_document
       solr_doc = {}
       Solrizer.set_field(solr_doc, 'system_create', c_time, :stored_sortable)
       Solrizer.set_field(solr_doc, 'system_modified', m_time, :stored_sortable)
-      Solrizer.set_field(solr_doc, 'active_fedora_model', object.class.inspect, :stored_sortable)
       solr_doc[QueryResultBuilder::HAS_MODEL_SOLR_FIELD] = object.has_model
       solr_doc[ActiveFedora.id_field.to_sym] = object.id
       solr_doc[self.class.profile_solr_name] = profile_service.new(object).export
diff --git a/lib/generators/active_fedora/config/solr/templates/solr/config/solrconfig.xml b/lib/generators/active_fedora/config/solr/templates/solr/config/solrconfig.xml
index 9de12a0ad..e5c5b2d24 100644
--- a/lib/generators/active_fedora/config/solr/templates/solr/config/solrconfig.xml
+++ b/lib/generators/active_fedora/config/solr/templates/solr/config/solrconfig.xml
@@ -102,7 +102,6 @@
        -->
         <str name="qf">
           id
-          active_fedora_model_ssi
           title_tesim
           author_tesim
           subject_tesim
diff --git a/solr/config/solrconfig.xml b/solr/config/solrconfig.xml
index 9de12a0ad..e5c5b2d24 100644
--- a/solr/config/solrconfig.xml
+++ b/solr/config/solrconfig.xml
@@ -102,7 +102,6 @@
        -->
         <str name="qf">
           id
-          active_fedora_model_ssi
           title_tesim
           author_tesim
           subject_tesim
diff --git a/spec/unit/indexing_spec.rb b/spec/unit/indexing_spec.rb
index 8d31ba192..978fc91f2 100644
--- a/spec/unit/indexing_spec.rb
+++ b/spec/unit/indexing_spec.rb
@@ -71,10 +71,6 @@ class SpecNode < ActiveFedora::Base
       expect(solr_doc[:id]).to eql("changeme:123")
     end
 
-    it "adds self.class as the :active_fedora_model" do
-      expect(subject[ActiveFedora.index_field_mapper.solr_name("active_fedora_model", :stored_sortable)]).to eql "SpecNode"
-    end
-
     context "with attached files" do
       let(:mock1) { double("ds1") }
       let(:mock2) { double("ds2") }
diff --git a/spec/unit/query_spec.rb b/spec/unit/query_spec.rb
index 464f58cf7..44e057cfb 100644
--- a/spec/unit/query_spec.rb
+++ b/spec/unit/query_spec.rb
@@ -95,11 +95,11 @@ class Basic < ActiveFedora::Base
     end
 
     it "queries for empty strings" do
-      expect(SpecModel::Basic.where(active_fedora_model_ssi: '').count).to eq 0
+      expect(SpecModel::Basic.where(has_model_ssim: '').count).to eq 0
     end
 
     it 'queries for empty arrays' do
-      expect(SpecModel::Basic.where(active_fedora_model_ssi: []).count).to eq 0
+      expect(SpecModel::Basic.where(has_model_ssim: []).count).to eq 0
     end
 
     it "adds options" do