diff --git a/Gemfile b/Gemfile index 12df0fa73..564067fe5 100644 --- a/Gemfile +++ b/Gemfile @@ -92,7 +92,7 @@ gem 'hyrax', '~> 3.5.0' gem 'bolognese', '>= 1.9.10' gem 'hyrax-doi', git: 'https://github.com/samvera-labs/hyrax-doi.git', branch: 'hyrax_upgrade' -gem 'iiif_print', git: 'https://github.com/scientist-softserv/iiif_print.git', branch: 'i98-bulkrax' +gem 'iiif_print', git: 'https://github.com/scientist-softserv/iiif_print.git', branch: 'i88-catalog-ocr-search' gem 'postrank-uri', '>= 1.0.24' gem 'redlock', '>= 0.1.2', '< 2.0' # lock redlock per https://github.com/samvera/hyrax/pull/5961 gem 'rsolr', '~> 2.0' diff --git a/Gemfile.lock b/Gemfile.lock index be588cd92..a06ea2cf4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -11,8 +11,8 @@ GIT GIT remote: https://github.com/scientist-softserv/iiif_print.git - revision: 6676caaba6c05166a9390b6ec20097ced8dc48d8 - branch: i98-bulkrax + revision: bd725c142f0e682e577195c05592e27c6879e5b5 + branch: i88-catalog-ocr-search specs: iiif_print (0.0.1) blacklight_advanced_search (= 6.4.1) @@ -22,6 +22,7 @@ GIT nokogiri (>= 1.13.2) rails (~> 5.0) rdf-vocab (~> 3.0) + sass-rails (~> 5.0) GIT remote: https://github.com/tawan/active-elastic-job.git diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb index fd9db15c2..55f651a37 100644 --- a/app/controllers/catalog_controller.rb +++ b/app/controllers/catalog_controller.rb @@ -61,7 +61,7 @@ def self.modified_field config.default_solr_params = { qt: "search", rows: 10, - qf: "title_tesim description_tesim creator_tesim keyword_tesim all_text_timv" + qf: "title_tesim description_tesim creator_tesim keyword_tesim all_text_tsimv" } # Specify which field to use in the tag cloud on the homepage. @@ -154,11 +154,11 @@ def self.modified_field # This one uses all the defaults set by the solr request handler. Which # solr request handler? The one set in config[:default_solr_parameters][:qt], # since we aren't specifying it otherwise. - config.add_search_field('all_fields', label: 'All Fields', include_in_advanced_search: false) do |field| + config.add_search_field('all_fields', label: 'All Fields', include_in_advanced_search: false, advanced_parse: false) do |field| all_names = config.show_fields.values.map(&:field).join(" ") title_name = 'title_tesim' field.solr_parameters = { - qf: "#{all_names} file_format_tesim all_text_timv", + qf: "#{all_names} file_format_tesim all_text_tsimv", pf: title_name.to_s } end diff --git a/config/initializers/iiif_print.rb b/config/initializers/iiif_print.rb index 157ea7c8c..f728dc967 100644 --- a/config/initializers/iiif_print.rb +++ b/config/initializers/iiif_print.rb @@ -1,5 +1,12 @@ IiifPrint.config do |config| # NOTE: WorkTypes and models are used synonymously here. + # + # Add WorkTypes into the Array to use PageDerivativeService + # @example + # # config.work_types_for_derivative_service = [GenericWork, Image] + # + # config.work_types_for_derivative_service = [] + # Add models to be excluded from search so the user # would not see them in the search results. # by default, use the human readable versions like: diff --git a/yarn.lock b/yarn.lock index 21de4fefc..86c92155a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -241,9 +241,9 @@ integrity sha512-0R6snlipi8tjMDKtSPKx6XZUm/K21FcF2t1pVqXyrDJxOd1jHdZnfmWh3uKOfGd/1HCfQgBNQlfi/pctORrigQ== "@types/node@*": - version "18.11.18" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.18.tgz#8dfb97f0da23c2293e554c5a50d61ef134d7697f" - integrity sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA== + version "18.13.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.13.0.tgz#0400d1e6ce87e9d3032c19eb6c58205b0d3f7850" + integrity sha512-gC3TazRzGoOnoKAhUx+Q0t8S9Tzs74z7m0ipwGpSqQrleP14hKxP4/JUeEQcD3W1/aIpnWl8pHowI7WokuZpXg== "@types/node@8.10.52": version "8.10.52" @@ -872,9 +872,9 @@ deep-is@~0.1.3: integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== define-properties@^1.1.3: - version "1.1.4" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1" - integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA== + version "1.2.0" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5" + integrity sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA== dependencies: has-property-descriptors "^1.0.0" object-keys "^1.1.1" @@ -1787,9 +1787,9 @@ minimist@1.2.0: integrity sha512-7Wl+Jz+IGWuSdgsQEJ4JunV0si/iMhg42MnQQG6h1R6TNeVenp4U9x5CC5v/gYqz/fENLQITAWXidNtVL0NNbw== minimist@^1.2.0: - version "1.2.7" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18" - integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== + version "1.2.8" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" + integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== ms@2.1.2: version "2.1.2" @@ -2909,8 +2909,8 @@ yallist@^4.0.0: integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== zustand@^4.1.5: - version "4.3.2" - resolved "https://registry.yarnpkg.com/zustand/-/zustand-4.3.2.tgz#bb121fcad84c5a569e94bd1a2695e1a93ba85d39" - integrity sha512-rd4haDmlwMTVWVqwvgy00ny8rtti/klRoZjFbL/MAcDnmD5qSw/RZc+Vddstdv90M5Lv6RPgWvm1Hivyn0QgJw== + version "4.3.3" + resolved "https://registry.yarnpkg.com/zustand/-/zustand-4.3.3.tgz#c9113499074dde2d6d99c1b5f591e9329572c224" + integrity sha512-x2jXq8S0kfLGNwGh87nhRfEc2eZy37tSatpSoSIN+O6HIaBhgQHSONV/F9VNrNcBcKQu/E80K1DeHDYQC/zCrQ== dependencies: use-sync-external-store "1.2.0"