Merge pull request #92 from scientist-softserv/i81-uv-text-search

[i81] - Fix OCR UV Search

app/indexers/concerns/iiif_print/file_set_indexer.rb

@@ -10,6 +10,7 @@ def generate_solr_document
       super.tap do |solr_doc|
         # only UV viewable images should have is_page_of, it is only used for iiif search
         solr_doc['is_page_of_ssim'] = [ancestor_ids(object)] if object.mime_type&.match(/image/)
+        solr_doc['all_text_tsimv'] = object.extracted_text.content if object.try(:extracted_text).try(:content)&.present?
         index_full_text(object, solr_doc)
       end
     end

app/models/concerns/iiif_print/blacklight_iiif_search/annotation_behavior.rb

@@ -73,6 +73,8 @@ def base_url
       # return the first file set id
       # @return [String]
       def file_set_id
+        return document['id'] if document.file_set?
+
         file_set_ids = document['file_set_ids_ssim']
         raise "#{self.class}: NO FILE SET ID" if file_set_ids.blank?
         file_set_ids.first

app/models/iiif_print/iiif_search_response_decorator.rb

@@ -0,0 +1,17 @@
+module IiifPrint
+  module IiifSearchResponseDecorator
+    # Enable the user to search for child metadata in the parent's UV
+    # @see https://github.com/scientist-softserv/louisville-hyku/commit/67467e5cf9fdb755f54419f17d3c24c87032d0af
+    def annotation_list
+      json_results = super
+      json_results&.[]('resources')&.each do |result_hit|
+        next if result_hit['resource'].present?
+        result_hit['resource'] = {
+          "@type": "cnt:ContentAsText",
+          "chars": "Metadata match, see sidebar for details"
+        }
+      end
+      json_results
+    end
+  end
+end

lib/generators/iiif_print/blacklight_iiif_search_generator.rb

@@ -26,14 +26,6 @@ def adjust_catalog_controller_is_page_of_config
                 "      object_relation_field: 'is_page_of_ssim',")
     end
 
-    # Update the IiifSearchBuilder
-    def adjust_iiif_search_builder
-      marker = 'solr_parameters[:hl] = true'
-      inject_into_file 'app/models/iiif_search_builder.rb', after: marker do
-        "\n    solr_parameters[:qf] = blacklight_config.iiif_search[:full_text_field]"
-      end
-    end
-
     def inject_search_behavior
       copy_file 'search_behavior.rb',
                 'app/models/concerns/blacklight_iiif_search/search_behavior.rb'

lib/iiif_print/engine.rb

@@ -31,6 +31,8 @@ class Engine < ::Rails::Engine
       Hyrax::ManifestBuilderService.prepend(IiifPrint::ManifestBuilderServiceBehavior)
       Hyrax::WorksControllerBehavior.prepend(IiifPrint::WorksControllerBehaviorDecorator)
       Hyrax::WorkShowPresenter.prepend(IiifPrint::WorkShowPresenterDecorator)
+      Hyrax::FileSetIndexer.prepend(IiifPrint::FileSetIndexer)
+      BlacklightIiifSearch::IiifSearchResponse.prepend(IiifPrint::IiifSearchResponseDecorator)
 
       # Extending the presenter to the base url which includes the protocol.
       # We need the base url to render the facet links and normalize the interface.