hOCR search: Fix view parameter name.

Islandora-Devops · Jul 19, 2024 · 1a3d029 · 1a3d029
1 parent 456e16e
commit 1a3d029
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 30 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -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
@@ -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: ''