From 1a3d029eee029ab1bd789142cd35fa1617e72ab6 Mon Sep 17 00:00:00 2001 From: Alexander O'Neill Date: Mon, 3 Jun 2024 19:54:13 -0300 Subject: [PATCH] hOCR search: Fix view parameter name. --- composer.json | 2 +- composer.lock | 3 +-- config/sync/key.key.islandora_rsa_key.yml | 2 +- ...lr_field_type.islandora_hocr_und_7_0_0.yml | 2 +- config/sync/views.view.iiif_manifest.yml | 24 +++++++++---------- config/sync/views.view.search_in_hocr.yml | 22 +++++++---------- 6 files changed, 25 insertions(+), 30 deletions(-) diff --git a/composer.json b/composer.json index 1cfd01a9d..7b2843227 100755 --- a/composer.json +++ b/composer.json @@ -28,7 +28,7 @@ ], "require": { "php": "^7.4 || ^8", - "born-digital/islandora_iiif_hocr": "^2@dev", + "born-digital/islandora_iiif_hocr": "^2", "composer/installers": "^1.9", "cweagans/composer-patches": "^1.7", "discoverygarden/dgi_image_discovery": "^1", diff --git a/composer.lock b/composer.lock index 0801947bc..11e6315df 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "5a1d6b4bb0100a89e642552dbf9ff4d1", + "content-hash": "6a63947955a4e1b16a2acccbe3929467", "packages": [ { "name": "adci/full-name-parser", @@ -12410,7 +12410,6 @@ ], "minimum-stability": "dev", "stability-flags": { - "born-digital/islandora_iiif_hocr": 20, "drupal/advanced_search": 10, "drupal/citation_select": 10, "drupal/config_update": 15, diff --git a/config/sync/key.key.islandora_rsa_key.yml b/config/sync/key.key.islandora_rsa_key.yml index 883398e4c..9e75e6f06 100644 --- a/config/sync/key.key.islandora_rsa_key.yml +++ b/config/sync/key.key.islandora_rsa_key.yml @@ -12,6 +12,6 @@ key_type_settings: algorithm: RS256 key_provider: file key_provider_settings: - file_location: /opt/islandora/auth/private.key + file_location: /opt/keys/jwt/private.key key_input: none key_input_settings: { } diff --git a/config/sync/search_api_solr.solr_field_type.islandora_hocr_und_7_0_0.yml b/config/sync/search_api_solr.solr_field_type.islandora_hocr_und_7_0_0.yml index 55c8d448d..f884cdc3c 100644 --- a/config/sync/search_api_solr.solr_field_type.islandora_hocr_und_7_0_0.yml +++ b/config/sync/search_api_solr.solr_field_type.islandora_hocr_und_7_0_0.yml @@ -13,6 +13,7 @@ domains: { } field_type: name: islandora_hocr_und class: solr.TextField + storeOffsetsWithPositions: true analyzers: - type: index @@ -83,7 +84,6 @@ field_type: class: solr.LowerCaseFilterFactory - class: solr.RemoveDuplicatesTokenFilterFactory - storeOffsetsWithPositions: true unstemmed_field_type: null spellcheck_field_type: null collated_field_type: null diff --git a/config/sync/views.view.iiif_manifest.yml b/config/sync/views.view.iiif_manifest.yml index 952972212..dde9bee81 100644 --- a/config/sync/views.view.iiif_manifest.yml +++ b/config/sync/views.view.iiif_manifest.yml @@ -450,11 +450,11 @@ display: field_media_image: field_media_image field_media_file: '0' iiif_ocr_file_field: - field_media_file: 0 - field_media_image: 0 - structured_text_term: '56' - search_endpoint: paged-content-search/%node + field_media_file: '0' + field_media_image: '0' structured_text_term_uri: 'https://discoverygarden.ca/use#hocr' + search_endpoint: paged-content-search/%node + structured_text_term: '56' row: type: data_field options: @@ -586,11 +586,11 @@ display: field_media_image: field_media_image field_media_file: '0' iiif_ocr_file_field: - field_media_file: 0 - field_media_image: 0 - structured_text_term: '56' - search_endpoint: single-page-content-search/%node + field_media_file: '0' + field_media_image: '0' structured_text_term_uri: 'https://discoverygarden.ca/use#hocr' + search_endpoint: single-page-content-search/%node + structured_text_term: '56' row: type: data_field options: @@ -663,11 +663,11 @@ display: field_media_file: field_media_file field_media_image: '0' iiif_ocr_file_field: - field_media_file: 0 - field_media_image: 0 - structured_text_term: '56' - search_endpoint: paged-content-search/%node + field_media_file: '0' + field_media_image: '0' structured_text_term_uri: 'https://discoverygarden.ca/use#hocr' + search_endpoint: paged-content-search/%node + structured_text_term: '56' row: type: data_field options: diff --git a/config/sync/views.view.search_in_hocr.yml b/config/sync/views.view.search_in_hocr.yml index 84ae59cad..08b97e3d2 100644 --- a/config/sync/views.view.search_in_hocr.yml +++ b/config/sync/views.view.search_in_hocr.yml @@ -147,7 +147,7 @@ display: type: none options: { } cache: - type: none + type: search_api_none options: { } empty: { } sorts: @@ -624,22 +624,20 @@ display: operator: search_api_fulltext_op operator_limit_selection: false operator_list: { } - identifier: search_content + identifier: search_hocr required: false remember: false multiple: false remember_roles: authenticated: authenticated anonymous: '0' + content_editor: '0' administrator: '0' - repository_admin: '0' - hampshire: '0' - mt_holyoke: '0' - smith: '0' - submission_reviewer: '0' + fedoraadmin: '0' expose_fields: false placeholder: '' searched_fields_id: search_api_fulltext_searched_fields + value_maxlength: 128 is_grouped: false group_info: label: '' @@ -981,22 +979,20 @@ display: operator: search_api_fulltext_op operator_limit_selection: false operator_list: { } - identifier: search_content + identifier: search_hocr required: false remember: false multiple: false remember_roles: authenticated: authenticated anonymous: '0' + content_editor: '0' administrator: '0' - repository_admin: '0' - hampshire: '0' - mt_holyoke: '0' - smith: '0' - submission_reviewer: '0' + fedoraadmin: '0' expose_fields: false placeholder: '' searched_fields_id: search_api_fulltext_searched_fields + value_maxlength: 128 is_grouped: false group_info: label: ''