blacklight_iiif_search 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 879ed21ad9e68168ae6444ef8dcd712dfdb898cf
-  data.tar.gz: 232275f5045f1bbb1eb7db47094554267fd8196e
+SHA256:
+  metadata.gz: 4358a1b34fd697ba1970f5f01026283f406abbc8a3e6e6da9bbac1d9366db87a
+  data.tar.gz: b52ca7666a8fbe3e374a55d4e553f53a31ec9eca46d864d85c553d0b22936092
 SHA512:
-  metadata.gz: 950611c765800d3c024eb1a698638393187967a5cc36587d790af2e4b02c97c7ecff4f0e9a7e99dd61ac902fc5af295d13f84e294a6909e3befae797c0622786
-  data.tar.gz: cd323e5edebd3b74a429cf41123f3244c29a82867c27ebe40abec2970c4cda82399c92c52d998fccd4012416d3b4c28704a3be440cfcb91ae70b7a2f707c35a2
+  metadata.gz: 5f47bf0ea3f7b869a1d279d8e17129a0a7dffa967781842a63526eb6d61bd37343d151be2a0fc80eca3461300efa7dca77dcaf2dc582748008eff5f9f7700901
+  data.tar.gz: 9db3d2c71682e95d8a31b10340de5c70d47302346b666f01cda4301afb447d57469069e12d84d30732e64813c0cfb81b7194b182bf461050c97de1f26cfa448c

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 begin
   require 'bundler/setup'
 rescue LoadError
@@ -32,7 +34,7 @@ require 'rubocop/rake_task'
 RuboCop::RakeTask.new(:rubocop)
 
 desc 'Run test suite'
-task ci: ['engine_cart:generate'] do # TODO: add rubocop
+task ci: [:rubocop, 'engine_cart:generate'] do
   SolrWrapper.wrap do |solr|
     FileUtils.cp File.join(__dir__, 'lib', 'generators', 'blacklight_iiif_search', 'templates', 'solr', 'lib', 'tokenizing-suggest-v1.0.1.jar'),
                  File.join(solr.instance_dir, 'contrib')

data/app/controllers/concerns/blacklight_iiif_search/controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # return a IIIF Content Search response
 module BlacklightIiifSearch
   module Controller
@@ -9,10 +11,12 @@ module BlacklightIiifSearch
     end
 
     def iiif_search
-      _parent_response, @parent_document = fetch(params[:solr_document_id])
+      _parent_response, @parent_document = search_service.fetch(params[:solr_document_id])
       iiif_search = IiifSearch.new(iiif_search_params, iiif_search_config,
                                    @parent_document)
-      @response, _document_list = search_results(iiif_search.solr_params)
+      iiif_search_service = search_service_class.new(config: blacklight_config,
+                                                     user_params: iiif_search.solr_params)
+      @response, _document_list = iiif_search_service.search_results
       iiif_search_response = IiifSearchResponse.new(@response,
                                                     @parent_document,
                                                     self)
@@ -21,7 +25,7 @@ module BlacklightIiifSearch
     end
 
     def iiif_suggest
-      suggest_search = IiifSuggestSearch.new(params, repository, self)
+      suggest_search = IiifSuggestSearch.new(params, Blacklight.default_index, self)
       render json: suggest_search.response,
              content_type: 'application/json'
     end

data/app/models/blacklight_iiif_search/iiif_search.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # IiifSearch
 module BlacklightIiifSearch
   class IiifSearch

data/app/models/blacklight_iiif_search/iiif_search_annotation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # corresponds to IIIF Annotation resource
 module BlacklightIiifSearch
   class IiifSearchAnnotation
@@ -14,6 +16,7 @@ module BlacklightIiifSearch
     # @param [String] snippet
     # @param [CatalogController] controller
     # @param [SolrDocument] parent_document
+    # rubocop:disable Metrics/ParameterLists
     def initialize(document, query, hl_index, snippet, controller, parent_document)
       @document = document
       @query = query
@@ -22,6 +25,7 @@ module BlacklightIiifSearch
       @controller = controller
       @parent_document = parent_document
     end
+    # rubocop:enable Metrics/ParameterLists
 
     ##
     # @return [IIIF::Presentation::Annotation]

data/app/models/blacklight_iiif_search/iiif_search_response.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # corresponds to a IIIF Annotation List
 module BlacklightIiifSearch
   class IiifSearchResponse

data/app/models/blacklight_iiif_search/iiif_suggest_response.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # corresponds to a IIIF search:TermList
 module BlacklightIiifSearch
   class IiifSuggestResponse

data/app/models/blacklight_iiif_search/iiif_suggest_search.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # IiifSuggestSearch
 module BlacklightIiifSearch
   class IiifSuggestSearch
@@ -28,10 +30,12 @@ module BlacklightIiifSearch
     ##
     # Query the suggest handler
     # @return [RSolr::HashWithResponse]
+    # rubocop:disable Style/HashSyntax
     def suggest_results
       suggest_params = { q: query, :'suggest.cfq' => document_id }
       repository.connection.send_and_receive(iiif_config[:autocomplete_handler],
                                              params: suggest_params)
     end
+    # rubocop:enable Style/HashSyntax
   end
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # customizable behavior for IiifSearchAnnotation
 module BlacklightIiifSearch
   module AnnotationBehavior

data/app/models/concerns/blacklight_iiif_search/ignored.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # returns ignored params
 module BlacklightIiifSearch
   module Ignored

data/app/models/concerns/blacklight_iiif_search/search_behavior.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # customizable behavior for IiifSearch
 module BlacklightIiifSearch
   module SearchBehavior

data/lib/blacklight_iiif_search.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # BlacklightIiifSearch
 module BlacklightIiifSearch
   require 'blacklight_iiif_search/version'

data/lib/blacklight_iiif_search/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BlacklightIiifSearch
   class Engine < ::Rails::Engine
     isolate_namespace BlacklightIiifSearch

data/lib/blacklight_iiif_search/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BlacklightIiifSearch
   class Routes
     def initialize(defaults = {})

data/lib/blacklight_iiif_search/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BlacklightIiifSearch
-  VERSION = '1.0.0'.freeze
+  VERSION = '2.0.0'
 end

data/lib/generators/blacklight_iiif_search/controller_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # adds controller-scope behavior to the implementing application
 require 'rails/generators'
 
@@ -24,8 +26,8 @@ module BlacklightIiifSearch
       inject_into_file "app/controllers/#{controller_name}_controller.rb", after: marker do
         "\n\n    # configuration for Blacklight IIIF Content Search
     config.iiif_search = {
-      full_text_field: 'text',
-      object_relation_field: 'is_page_of_s',
+      full_text_field: 'all_text_timv',
+      object_relation_field: 'is_page_of_ssi',
       supported_params: %w[q page],
       autocomplete_handler: 'iiif_suggest',
       suggester_name: 'iiifSuggester'

data/lib/generators/blacklight_iiif_search/install_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # install BlacklightIiifSearch behavior into implementing application
 require 'rails/generators'
 
@@ -8,8 +10,7 @@ module BlacklightIiifSearch
     argument :search_builder_name, type: :string, default: 'search_builder'
     argument :controller_name, type: :string, default: 'catalog'
 
-    class_option :'skip-solr', type: :boolean,
-                 default: false, desc: 'Skip generating Solr configurations.'
+    class_option :'skip-solr', type: :boolean, default: false, desc: 'Skip generating Solr configurations.'
 
     desc <<-EOS
       Install generator for Blacklight IIIF Search

data/lib/generators/blacklight_iiif_search/model_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # add the SearchBuilder to the implementing application
 require 'rails/generators'
 

data/lib/generators/blacklight_iiif_search/routes_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # insert routing for IIIF Content Search
 require 'rails/generators'
 
@@ -10,16 +12,16 @@ module BlacklightIiifSearch
 
     # Add CommonwealthVlrEngine to the routes
     def inject_iiif_search_routes
-      unless IO.read('config/routes.rb').include?('BlacklightIiifSearch::Routes')
-        marker = 'Rails.application.routes.draw do'
-        inject_into_file 'config/routes.rb', after: marker do
-          "\n\n  concern :iiif_search, BlacklightIiifSearch::Routes.new"
-        end
-        # for blacklight_range_limit
-        bl_routes_marker = /resources :solr_documents[\S\s]*controller: 'catalog' do[\s]*concerns :exportable.*$/
-        inject_into_file 'config/routes.rb', after: bl_routes_marker do
-          "\n    concerns :iiif_search"
-        end
+      return if IO.read('config/routes.rb').include?('BlacklightIiifSearch::Routes')
+
+      marker = 'Rails.application.routes.draw do'
+      inject_into_file 'config/routes.rb', after: marker do
+        "\n\n  concern :iiif_search, BlacklightIiifSearch::Routes.new"
+      end
+      # for blacklight_range_limit
+      bl_routes_marker = /resources :solr_documents[\S\s]*controller: 'catalog' do[\s]*concerns :exportable.*$/
+      inject_into_file 'config/routes.rb', after: bl_routes_marker do
+        "\n    concerns :iiif_search"
       end
     end
   end

data/lib/generators/blacklight_iiif_search/solr_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # adds iiif_suggest configuration to Solr solrconfig.xml and schema.xml
 # to allow for suggestions limited by a contextField
 require 'rails/generators'
@@ -9,10 +11,11 @@ module BlacklightIiifSearch
     desc 'Adds iiif_suggest configuration to Solr solrconfig.xml and schema.xml'
 
     def inject_iiif_suggest_solrconfig
-      unless IO.read('solr/conf/solrconfig.xml').include?('iiif_suggest')
-        marker = '</config>'
-        inject_into_file 'solr/conf/solrconfig.xml', before: marker do
-          "  <!-- BEGIN Blacklight IIIF Search autocomplete config -->
+      return if IO.read('solr/conf/solrconfig.xml').include?('iiif_suggest')
+
+      marker = '</config>'
+      inject_into_file 'solr/conf/solrconfig.xml', before: marker do
+        "  <!-- BEGIN Blacklight IIIF Search autocomplete config -->
   <!-- solr-tokenizing_suggester is necessary to return single terms from the suggester -->
   <lib dir=\"${solr.install.dir:../../../..}/contrib\" regex=\"tokenizing-suggest-v1.0.1.jar\" />\n
   <searchComponent name=\"iiif_suggest\" class=\"solr.SuggestComponent\">
@@ -22,7 +25,7 @@ module BlacklightIiifSearch
       <str name=\"dictionaryImpl\">DocumentDictionaryFactory</str>
       <str name=\"suggestAnalyzerFieldType\">textSuggest</str>
       <str name=\"suggestTokenizingAnalyzerFieldType\">textSuggestTokenizer</str>
-      <str name=\"contextField\">is_page_of_s</str>
+      <str name=\"contextField\">is_page_of_ssi</str>
       <str name=\"buildOnCommit\">true</str>
       <str name=\"field\">iiif_suggest</str>
     </lst>
@@ -38,16 +41,16 @@ module BlacklightIiifSearch
     </arr>
   </requestHandler>
   <!-- END Blacklight IIIF Search autocomplete config -->\n\n"
-        end
       end
     end
 
     def inject_iiif_suggest_schema
       filepath = 'solr/conf/schema.xml'
-      unless IO.read(filepath).include?('iiif_suggest')
-        field_type_marker = '</types>'
-        inject_into_file filepath, before: field_type_marker do
-          "\n    <!-- BEGIN Blacklight IIIF Search autocomplete config -->
+      return if IO.read(filepath).include?('iiif_suggest')
+
+      field_type_marker = '</types>'
+      inject_into_file filepath, before: field_type_marker do
+        "\n    <!-- BEGIN Blacklight IIIF Search autocomplete config -->
     <fieldType name=\"textSuggestTokenizer\" class=\"solr.TextField\" positionIncrementGap=\"100\">
       <analyzer>
         <tokenizer class=\"solr.WhitespaceTokenizerFactory\"/>
@@ -61,27 +64,26 @@ module BlacklightIiifSearch
       </analyzer>
     </fieldType>
     <!-- END Blacklight IIIF Search autocomplete config -->\n\n"
-        end
+      end
 
-        fields_marker = '</fields>'
-        inject_into_file filepath, before: fields_marker do
-          "  <!-- BEGIN Blacklight IIIF Search autocomplete config -->
+      fields_marker = '</fields>'
+      inject_into_file filepath, before: fields_marker do
+        "  <!-- BEGIN Blacklight IIIF Search autocomplete config -->
    <field name=\"iiif_suggest\" type=\"textSuggest\" indexed=\"true\" stored=\"true\" multiValued=\"true\" />
    <!-- END Blacklight IIIF Search autocomplete config -->\n\n"
-        end
+      end
 
-        copy_marker = '</schema>'
-        inject_into_file filepath, before: copy_marker do
-          "  <!-- BEGIN Blacklight IIIF Search autocomplete config -->
-  <copyField source=\"text\" dest=\"iiif_suggest\"/>
+      copy_marker = '</schema>'
+      inject_into_file filepath, before: copy_marker do
+        "  <!-- BEGIN Blacklight IIIF Search autocomplete config -->
+  <copyField source=\"all_text_timv\" dest=\"iiif_suggest\"/>
   <!-- END Blacklight IIIF Search autocomplete config -->\n\n"
-        end
       end
     end
 
     def copy_suggester_library
-      copy_file 'solr/lib/solr-tokenizing_suggester-7.x.jar',
-                'solr/lib/solr-tokenizing_suggester-7.x.jar'
+      copy_file 'solr/lib/tokenizing-suggest-v1.0.1.jar',
+                'solr/lib/tokenizing-suggest-v1.0.1.jar'
     end
   end
 end

data/lib/generators/blacklight_iiif_search/templates/iiif_search_builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # SearchBuilder for full-text searches with highlighting and snippets
 class IiifSearchBuilder < Blacklight::SearchBuilder
   include Blacklight::Solr::SearchBuilderBehavior

data/lib/railties/blacklight_iiif_search.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 namespace :blacklight_iiif_search do
   namespace :index do
     desc 'Put sample data into solr'

data/spec/controllers/catalog_controller_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'iiif_search_shared'
 RSpec.describe CatalogController do
   include_context 'iiif_search_shared'
@@ -18,11 +20,11 @@ RSpec.describe CatalogController do
     end
 
     describe '#iiif_search_config' do
-      subject { controller.iiif_search_config }
+      subject(:iiif_search_config) { controller.iiif_search_config }
       it 'returns the iiif_search config' do
-        expect(subject[:full_text_field]).to_not be_falsey
-        expect(subject[:object_relation_field]).to_not be_falsey
-        expect(subject[:supported_params]).to_not be_empty
+        expect(iiif_search_config[:full_text_field]).not_to be_falsey
+        expect(iiif_search_config[:object_relation_field]).not_to be_falsey
+        expect(iiif_search_config[:supported_params]).not_to be_empty
       end
     end
 
@@ -31,10 +33,10 @@ RSpec.describe CatalogController do
         controller.params = { q: query_term, foo: 'bar' }
       end
 
-      subject { controller.iiif_search_params }
+      subject(:iiif_search_params) { controller.iiif_search_params }
       it 'only returns the permitted params' do
-        expect(subject.include?(:q)).to be_truthy
-        expect(subject.include?(:foo)).to be_falsey
+        expect(iiif_search_params.include?(:q)).to be_truthy
+        expect(iiif_search_params.include?(:foo)).to be_falsey
       end
     end
 
@@ -45,13 +47,13 @@ RSpec.describe CatalogController do
       end
 
       describe '#set_search_builder' do
-        it 'should use IiifSearchBuilder' do
+        it 'uses IiifSearchBuilder' do
           expect(controller.blacklight_config.search_builder_class).to eq(IiifSearchBuilder)
         end
       end
 
       describe '#set_access_headers' do
-        it 'should set the access control header' do
+        it 'sets the access control header' do
           expect(response.headers['Access-Control-Allow-Origin']).to eq('*')
         end
       end
@@ -67,7 +69,7 @@ RSpec.describe CatalogController do
       let(:json) { JSON.parse(response.body) }
 
       it 'returns a response' do
-        expect(response).to be_success
+        expect(response.code).to eq '200'
       end
 
       it 'returns a IIIF AnnotationList' do
@@ -86,7 +88,7 @@ RSpec.describe CatalogController do
       let(:json) { JSON.parse(response.body) }
 
       it 'returns a response' do
-        expect(response).to be_success
+        expect(response.code).to eq '200'
       end
 
       it 'returns a IIIF TermList' do

data/spec/fixtures/sample_solr_documents.yml

@@ -1,272 +1,272 @@
 # Sample Solr docs for full-text search, representing book and pages.
-# We duplicate full text in isbn_t field since this is the only text field
-# that is indexed and stored in schema.xml AND searched by default
-# requestHandler in solrconfig.xml in out-of-box Blacklight 6.* Solr config,
+# We duplicate full text in alternative_title_tsim field since this field
+# is indexed and stored in schema.xml AND searched by default
+# requestHandler in solrconfig.xml in out-of-box Blacklight 7.* Solr config,
 # which allows us to test highlighting and snippets.
 ---
-- object_model_s:
+- object_model_ssi:
   - Book
   id:
   - 7s75dn48d
-  label_s:
+  label_ssi:
   - Raw denim raclette hexagon
-  title_t:
+  title_tsim:
   - Raw denim raclette hexagon
-  title_display: Raw denim raclette hexagon
-  author_t:
+  title_ss: Raw denim raclette hexagon
+  author_tsim:
   - Doe, Jane
-  author_display: Jane Doe
-  has_searchable_text_b:
+  author_ss: Jane Doe
+  has_searchable_text_bsi:
   - true
-  text_direction_s:
+  text_direction_ssi:
   - ltr
   timestamp:
   - '2015-11-18T21:22:14.23Z'
-- object_model_s:
+- object_model_ssi:
   - ImageFile
   id:
   - 7s75dn59x
-  is_file_of_s:
+  is_file_of_ssi:
   - 7s75dn48d
-  is_following_page_of_s:
+  is_following_page_of_ssi:
   - 7s75dn58n
-  is_page_of_s:
+  is_page_of_ssi:
   - 7s75dn48d
-  is_preceding_page_of_s:
+  is_preceding_page_of_ssi:
   - 7s75dn60x
-  page_type_s:
+  page_type_ssi:
   - Normal
-  hand_side_s:
+  hand_side_ssi:
   - RIGHT
-  page_num_label_s:
+  page_num_label_ssi:
   - 5
-  page_num_label_type_s:
+  page_num_label_type_ssi:
   - original
-  text:
+  all_text_timv:
   - In selecting sugar the confectioner must bear in mind that it is the foundation of all confectionery, and can not expect to manufacture iirst-class goods except from first-class material; hence, select only sugar that is perfectly dry and of uniform quality, and in white, hard, sparkling crystals; only such sugar will give satisfaction.
-  isbn_t:
+  alternative_title_tsim:
   - In selecting sugar the confectioner must bear in mind that it is the foundation of all confectionery, and can not expect to manufacture iirst-class goods except from first-class material; hence, select only sugar that is perfectly dry and of uniform quality, and in white, hard, sparkling crystals; only such sugar will give satisfaction.
   timestamp:
   - '2015-11-18T21:09:44.574Z'
-- object_model_s:
+- object_model_ssi:
   - Book
   id:
   - 3j334603p
-  label_s:
+  label_ssi:
   - Quinoa gastropub snackwave
-  title_t:
+  title_tsim:
   - Quinoa gastropub snackwave
-  title_display: Quinoa gastropub snackwave
-  author_t:
+  title_ss: Quinoa gastropub snackwave
+  author_tsim:
   - Doe, John
-  author_display: John Doe
-  has_searchable_text_b:
+  author_ss: John Doe
+  has_searchable_text_bsi:
   - true
-  text_direction_s:
+  text_direction_ssi:
   - ltr
   timestamp:
   - '2015-11-18T19:32:49.014Z'
-- object_model_s:
+- object_model_ssi:
   - ImageFile
   id:
   - 3j334628j
-  is_file_of_s:
+  is_file_of_ssi:
   - 3j334603p
-  is_page_of_s:
+  is_page_of_ssi:
   - 3j334603p
-  page_type_s:
+  page_type_ssi:
   - Normal
-  hand_side_s:
+  hand_side_ssi:
   - RIGHT
-  page_num_label_s:
+  page_num_label_ssi:
   - 1
-  page_num_label_type_s:
+  page_num_label_type_ssi:
   - original
-  text:
+  all_text_timv:
   - In choosing Colors for candy, certain qualifications are necessary. First, they must not fade or change when exposed to the light. Second, they must not be easily affected by acids or alkalies; hence, it has been difficult to produce colors that are reasonably permanent and at the same time harmless. Yet the following will be found as near perfect as any yet produced.
-  isbn_t:
+  alternative_title_tsim:
   - In choosing Colors for candy, certain qualifications are necessary. First, they must not fade or change when exposed to the light. Second, they must not be easily affected by acids or alkalies; hence, it has been difficult to produce colors that are reasonably permanent and at the same time harmless. Yet the following will be found as near perfect as any yet produced.
   timestamp:
   - '2015-11-18T17:27:35.361Z'
-- object_model_s:
+- object_model_ssi:
   - ImageFile
   id:
   - 7s75dn58n
-  is_file_of_s:
+  is_file_of_ssi:
   - 7s75dn48d
-#  is_following_page_of_s:
+#  is_following_page_of_ssi:
 #  - 7s75dn57c
-  is_page_of_s:
+  is_page_of_ssi:
   - 7s75dn48d
-  is_preceding_page_of_s:
+  is_preceding_page_of_ssi:
   - 7s75dn59x
-  page_type_s:
+  page_type_ssi:
   - Normal
-  hand_side_s:
+  hand_side_ssi:
   - LEFT
-  page_num_label_s:
+  page_num_label_ssi:
   - 4
-  page_num_label_type_s:
+  page_num_label_type_ssi:
   - original
-  text:
+  all_text_timv:
   - Twelve pounds of sugar, two quarts of water, stir until dissolved, then add one full teaspoon of cream of tartar, (or if you wish to use glucose, add three pounds of same, do this when you are weighing your sugar, by hollowing out a place in the center of the sugar and pouring in the glucose). Now put on the steamer and let it remain until the batch begins to cook, then remove; in this way all the grains of sugar adhereing to the sides of the basin are washed down.
-  isbn_t:
+  alternative_title_tsim:
   - Twelve pounds of sugar, two quarts of water, stir until dissolved, then add one full teaspoon of cream of tartar, (or if you wish to use glucose, add three pounds of same, do this when you are weighing your sugar, by hollowing out a place in the center of the sugar and pouring in the glucose). Now put on the steamer and let it remain until the batch begins to cook, then remove; in this way all the grains of sugar adhereing to the sides of the basin are washed down.
   timestamp:
   - '2015-11-18T21:09:30.2Z'
-- object_model_s:
+- object_model_ssi:
   - ImageFile
   id:
   - 7s75dn60x
-  is_file_of_s:
+  is_file_of_ssi:
   - 7s75dn48d
-  is_following_page_of_s:
+  is_following_page_of_ssi:
   - 7s75dn59x
-  is_page_of_s:
+  is_page_of_ssi:
   - 7s75dn48d
-  is_preceding_page_of_s:
+  is_preceding_page_of_ssi:
   - 7s75dn61x
-  page_type_s:
+  page_type_ssi:
   - Normal
-  hand_side_s:
+  hand_side_ssi:
   - LEFT
-  page_num_label_s:
+  page_num_label_ssi:
   - 6
-  page_num_label_type_s:
+  page_num_label_type_ssi:
   - original
-  text:
+  all_text_timv:
   - when it begins to boil, add six pounds of Almond Nuts, after haying picked out all shells and dusted the nuts thoroughly; stir slowly, keeping the sides of the basin well washed, until nuts are as brown as wished, and slide off the spatula easily when raised up
-  isbn_t:
+  alternative_title_tsim:
   - when it begins to boil, add six pounds of Almond Nuts, after haying picked out all shells and dusted the nuts thoroughly; stir slowly, keeping the sides of the basin well washed, until nuts are as brown as wished, and slide off the spatula easily when raised up
   timestamp:
   - '2015-11-19T21:09:44.574Z'
-- object_model_s:
+- object_model_ssi:
   - ImageFile
   id:
   - 7s75dn61x
-  is_file_of_s:
+  is_file_of_ssi:
   - 7s75dn48d
-  is_following_page_of_s:
+  is_following_page_of_ssi:
   - 7s75dn60x
-  is_page_of_s:
+  is_page_of_ssi:
   - 7s75dn48d
-  is_preceding_page_of_s:
+  is_preceding_page_of_ssi:
   - 7s75dn62x
-  page_type_s:
+  page_type_ssi:
   - Normal
-  hand_side_s:
+  hand_side_ssi:
   - RIGHT
-  page_num_label_s:
+  page_num_label_ssi:
   - 7
-  page_num_label_type_s:
+  page_num_label_type_ssi:
   - original
-  text:
+  all_text_timv:
   - These Caramel receipts are the best in the worlds and the author questions the ability of any one to produce a Caramel that will excell them in any particular. After once making by either one of the following formulas, no other will be used, as they are worth a dozen times the price of this book, to any one wishing to give his trade a fine Caramel.
-  isbn_t:
+  alternative_title_tsim:
   - These Caramel receipts are the best in the worlds and the author questions the ability of any one to produce a Caramel that will excell them in any particular. After once making by either one of the following formulas, no other will be used, as they are worth a dozen times the price of this book, to any one wishing to give his trade a fine Caramel.
   timestamp:
   - '2015-11-20T21:09:44.574Z'
-- object_model_s:
+- object_model_ssi:
   - ImageFile
   id:
   - 7s75dn62x
-  is_file_of_s:
+  is_file_of_ssi:
   - 7s75dn48d
-  is_following_page_of_s:
+  is_following_page_of_ssi:
   - 7s75dn61x
-  is_page_of_s:
+  is_page_of_ssi:
   - 7s75dn48d
-  is_preceding_page_of_s:
+  is_preceding_page_of_ssi:
   - 7s75dn63x
-  page_type_s:
+  page_type_ssi:
   - Normal
-  hand_side_s:
+  hand_side_ssi:
   - LEFT
-  page_num_label_s:
+  page_num_label_ssi:
   - 8
-  page_num_label_type_s:
+  page_num_label_type_ssi:
   - original
-  text:
+  all_text_timv:
   - Same as Hickory-nut Cups, except make a center of almond paste, colored light green; when on the slab, add to the clear batch a few drops of red color, some Nectar flavor, and fold all together, pull on the hook to a bright pink, and finish as before.
-  isbn_t:
+  alternative_title_tsim:
   - Same as Hickory-nut Cups, except make a center of almond paste, colored light green; when on the slab, add to the clear batch a few drops of red color, some Nectar flavor, and fold all together, pull on the hook to a bright pink, and finish as before.
   timestamp:
   - '2015-11-21T21:09:44.574Z'
-- object_model_s:
+- object_model_ssi:
   - ImageFile
   id:
   - 7s75dn63x
-  is_file_of_s:
+  is_file_of_ssi:
   - 7s75dn48d
-  is_following_page_of_s:
+  is_following_page_of_ssi:
   - 7s75dn62x
-  is_page_of_s:
+  is_page_of_ssi:
   - 7s75dn48d
-  is_preceding_page_of_s:
+  is_preceding_page_of_ssi:
   - 7s75dn64x
-  page_type_s:
+  page_type_ssi:
   - Normal
-  hand_side_s:
+  hand_side_ssi:
   - RIGHT
-  page_num_label_s:
+  page_num_label_ssi:
   - 9
-  page_num_label_type_s:
+  page_num_label_type_ssi:
   - original
-  text:
+  all_text_timv:
   - as it looks cloudy, pour it out at once in a deep pan; this must be done quickly or it will become hard in the basin; when cold, remove it it from the pan in the same manner as the pan creams; mark it into bars or large squares for the counter.
-  isbn_t:
+  alternative_title_tsim:
   - as it looks cloudy, pour it out at once in a deep pan; this must be done quickly or it will become hard in the basin; when cold, remove it it from the pan in the same manner as the pan creams; mark it into bars or large squares for the counter.
   timestamp:
   - '2015-11-22T21:09:44.574Z'
-- object_model_s:
+- object_model_ssi:
   - ImageFile
   id:
   - 7s75dn64x
-  is_file_of_s:
+  is_file_of_ssi:
   - 7s75dn48d
-  is_following_page_of_s:
+  is_following_page_of_ssi:
   - 7s75dn63x
-  is_page_of_s:
+  is_page_of_ssi:
   - 7s75dn48d
-  is_preceding_page_of_s:
+  is_preceding_page_of_ssi:
   - 7s75dn65x
-  page_type_s:
+  page_type_ssi:
   - Normal
-  hand_side_s:
+  hand_side_ssi:
   - LEFT
-  page_num_label_s:
+  page_num_label_ssi:
   - 10
-  page_num_label_type_s:
+  page_num_label_type_ssi:
   - original
-  text:
+  all_text_timv:
   - cut into small squares; cook just to a thread; remove and, with the spatula, work the syrup on the sides of the basin till it becomes cloudy; pour all on a wire sieve, having a pan under it to catch the syrup that drains from the Cocoanuts
-  isbn_t:
+  alternative_title_tsim:
   - cut into small squares; cook just to a thread; remove and, with the spatula, work the syrup on the sides of the basin till it becomes cloudy; pour all on a wire sieve, having a pan under it to catch the syrup that drains from the Cocoanuts
   timestamp:
   - '2015-11-23T21:09:44.574Z'
-- object_model_s:
+- object_model_ssi:
   - ImageFile
   id:
   - 7s75dn65x
-  is_file_of_s:
+  is_file_of_ssi:
   - 7s75dn48d
-  is_following_page_of_s:
+  is_following_page_of_ssi:
   - 7s75dn64x
-  is_page_of_s:
+  is_page_of_ssi:
   - 7s75dn48d
-#  is_preceding_page_of_s:
+#  is_preceding_page_of_ssi:
 #  - 7s75dn65x
-  page_type_s:
+  page_type_ssi:
   - Normal
-  hand_side_s:
+  hand_side_ssi:
   - RIGHT
-  page_num_label_s:
+  page_num_label_ssi:
   - 11
-  page_num_label_type_s:
+  page_num_label_type_ssi:
   - original
-  text:
+  all_text_timv:
   - Take of dipping Cream any number of pounds desired, say five; put it into a basin inside of another one containing water; place on the fire; stir the Cream until dissolved, but not thin; add a few drops of red color, and flavor Nectar or Strawberry
-  isbn_t:
+  alternative_title_tsim:
   - Take of dipping Cream any number of pounds desired, say five; put it into a basin inside of another one containing water; place on the fire; stir the Cream until dissolved, but not thin; add a few drops of red color, and flavor Nectar or Strawberry
   timestamp:
   - '2015-11-24T21:09:44.574Z'