Merge pull request #132 from scientist-softserv/consolidating-generators

Consolidating generators

lib/generators/iiif_print/catalog_controller_generator.rb

@@ -3,11 +3,10 @@
 
 module IiifPrint
   class CatalogControllerGenerator < Rails::Generators::Base
-    source_root File.expand_path('../templates', __FILE__)
-
     desc "
       This generator makes the following changes to your app:
       1. Adds index fields in CatalogController
+      2. Adjusts Blacklight IIIF Search configuration settings in CatalogController
       "
 
     def add_index_fields_to_catalog_controller
@@ -17,5 +16,17 @@ def add_index_fields_to_catalog_controller
         "    config.add_index_field 'all_text_tsimv', highlight: true, helper_method: :render_ocr_snippets\n"
       end
     end
+
+    def adjust_catalog_controller_all_text_config
+      gsub_file('app/controllers/catalog_controller.rb',
+                " full_text_field: 'text',",
+                " full_text_field: 'all_text_tsimv',")
+    end
+
+    def adjust_catalog_controller_is_page_of_config
+      gsub_file('app/controllers/catalog_controller.rb',
+                " object_relation_field: 'is_page_of_s',",
+                " object_relation_field: 'is_page_of_ssim',")
+    end
   end
 end

lib/generators/iiif_print/install_generator.rb

@@ -18,10 +18,6 @@ def verify_biiif_installed
       generate 'blacklight_iiif_search:install'
     end
 
-    def iiif_configuration
-      generate 'iiif_print:blacklight_iiif_search'
-    end
-
     def catalog_controller_configuration
       generate 'iiif_print:catalog_controller'
     end