From b4c90cbb4acc66e506a06eac88d5949a36d871e0 Mon Sep 17 00:00:00 2001 From: Don Richards Date: Tue, 28 Nov 2023 14:14:14 -0500 Subject: [PATCH] Community imports --- config/sync/block.block.search.yml | 15 ++- config/sync/context.context.collection.yml | 2 +- .../search_api.index.default_solr_index.yml | 96 +++++++------------ .../sync/views.view.solr_search_content.yml | 88 ++++++++++------- web/sites/default/default.services.yml | 33 ++----- 5 files changed, 109 insertions(+), 125 deletions(-) diff --git a/config/sync/block.block.search.yml b/config/sync/block.block.search.yml index 61234cd00..7a230a7ac 100644 --- a/config/sync/block.block.search.yml +++ b/config/sync/block.block.search.yml @@ -1,23 +1,24 @@ uuid: 42d9fb99-0fff-4f1c-a514-c0c6f8091e18 langcode: en -status: false +status: true dependencies: module: - advanced_search - context - islandora + - system theme: - idc_ui_theme_boots id: search theme: idc_ui_theme_boots -region: sidebar_first -weight: 0 +region: primary_menu +weight: -11 provider: null plugin: search_block settings: id: search_block label: Search - label_display: visible + label_display: '0' provider: advanced_search block_id: search search_view_machine_name: view.solr_search_content.page_1 @@ -28,7 +29,7 @@ visibility: context_all: id: context_all negate: null - values: collection + values: '' context: id: context negate: null @@ -49,3 +50,7 @@ visibility: negate: false context_mapping: { } mimetype: '' + request_path: + id: request_path + negate: true + pages: /search diff --git a/config/sync/context.context.collection.yml b/config/sync/context.context.collection.yml index 1f8a91946..47f2f3ae3 100644 --- a/config/sync/context.context.collection.yml +++ b/config/sync/context.context.collection.yml @@ -19,7 +19,7 @@ conditions: negate: false context_mapping: node: '@node.node_route_context:node' - uri: 'http://purl.org/dc/dcmitype/Collection,http://vocab.getty.edu/aat/300242735' + uri: 'http://purl.org/dc/dcmitype/Collection,http://vocab.getty.edu/aat/300242735,http://purl.org/ontology/bibo/Collection' logic: or reactions: blocks: diff --git a/config/sync/search_api.index.default_solr_index.yml b/config/sync/search_api.index.default_solr_index.yml index fbad0b1a6..4a65fec75 100644 --- a/config/sync/search_api.index.default_solr_index.yml +++ b/config/sync/search_api.index.default_solr_index.yml @@ -3,7 +3,6 @@ langcode: en status: true dependencies: config: - - field.storage.node.field_abstract - field.storage.node.field_alt_title - field.storage.node.field_member_of - field.storage.node.field_description @@ -20,6 +19,7 @@ dependencies: - field.storage.node.field_resource_type - field.storage.node.field_rights - field.storage.node.field_tags + - field.storage.node.field_abstract - field.storage.node.field_subject_general - field.storage.node.field_geographic_subject - field.storage.node.field_subjects_name @@ -39,7 +39,6 @@ third_party_settings: finalize: false commit_before_finalize: false commit_after_finalize: false - debug_finalize: false highlighter: maxAnalyzedChars: 51200 fragmenter: regex @@ -55,31 +54,14 @@ third_party_settings: requireFieldMatch: false snippets: 3 fragsize: 0 - mlt: - mintf: 1 - mindf: 1 - maxdf: 0 - maxdfpct: 0 - minwl: 0 - maxwl: 0 - maxqt: 100 - maxntp: 2000 - boost: false - interestingTerms: none - term_modifiers: - slop: 3 - fuzzy: 1 advanced: index_prefix: '' - collection: '' - timezone: '' multilingual: - limit_to_content_language: false - include_language_independent: true use_language_undefined_as_fallback_language: false - specific_languages: - en: '0' + specific_languages: { } use_universal_collation: false +_core: + default_config_hash: 3HSYR81fyYsY--a93ZG1VSN3PEHVN_o78qIhDfsxzs4 id: default_solr_index name: 'Default Solr content index' description: 'Default content index created by the Solr Search Defaults module' @@ -91,11 +73,6 @@ field_settings: type: text configuration: type: union - separator: |+ - - - - fields: - 'entity:node/field_abstract' - 'entity:node/field_description' @@ -128,14 +105,6 @@ field_settings: label: 'EDTF Creation Date Year' property_path: edtf_year type: integer - field_abstract: - label: Abstract - datasource_id: 'entity:node' - property_path: field_abstract - type: text - dependencies: - config: - - field.storage.node.field_abstract field_alt_title: label: 'Alternative Title' datasource_id: 'entity:node' @@ -234,13 +203,11 @@ field_settings: field_member_of: label: 'Member of' datasource_id: 'entity:node' - property_path: 'field_member_of:entity:field_member_of' + property_path: field_member_of type: integer dependencies: config: - field.storage.node.field_member_of - module: - - node field_oclc_number: label: 'OCLC Number' datasource_id: 'entity:node' @@ -262,13 +229,11 @@ field_settings: field_resource_type: label: 'Resource Type' datasource_id: 'entity:node' - property_path: 'field_resource_type:entity:name' - type: string + property_path: field_resource_type + type: integer dependencies: config: - field.storage.node.field_resource_type - module: - - taxonomy field_rights: label: Rights datasource_id: 'entity:node' @@ -285,6 +250,26 @@ field_settings: dependencies: config: - field.storage.node.field_tags + linked_agent_name_fulltext: + label: Names + datasource_id: 'entity:node' + property_path: 'field_linked_agent:entity:name' + type: text + dependencies: + config: + - field.storage.node.field_linked_agent + module: + - taxonomy + linked_agent_vid: + label: 'Linked Agent Vocab' + datasource_id: 'entity:node' + property_path: 'field_linked_agent:entity:vid' + type: string + dependencies: + config: + - field.storage.node.field_linked_agent + module: + - taxonomy member_of_title: label: 'Member of » Content » Title' datasource_id: 'entity:node' @@ -310,6 +295,14 @@ field_settings: indexed_locked: true type_locked: true hidden: true + processed: + label: Abstract + datasource_id: 'entity:node' + property_path: 'field_abstract:processed' + type: string + dependencies: + config: + - field.storage.node.field_abstract rendered_item: label: 'Rendered item' property_path: rendered_item @@ -320,7 +313,6 @@ field_settings: view_mode: 'entity:node': article: search_index - collection_object: '' islandora_object: search_index page: search_index status: @@ -347,11 +339,6 @@ field_settings: type: text configuration: type: union - separator: |+ - - - - fields: - 'entity:node/field_geographic_subject' - 'entity:node/field_subject' @@ -433,14 +420,8 @@ field_settings: type: text configuration: type: union - separator: |+ - - - - fields: - 'entity:node/field_alt_title' - - 'entity:node/field_alternative_title' - 'entity:node/field_full_title' - 'entity:node/title' type: @@ -481,12 +462,8 @@ processor_settings: weights: preprocess_index: -6 preprocess_query: -4 - custom_value: { } edtf_year_only: fields: - collection_object|field_edtf_date: collection_object|field_edtf_date - collection_object|field_edtf_date_created: collection_object|field_edtf_date_created - collection_object|field_edtf_date_issued: collection_object|field_edtf_date_issued islandora_object|field_copyright_date: islandora_object|field_copyright_date islandora_object|field_edtf_date: islandora_object|field_edtf_date islandora_object|field_edtf_date_created: islandora_object|field_edtf_date_created @@ -505,6 +482,7 @@ processor_settings: preprocess_index: -45 fields: field_descendant_of: node-field_member_of + field_resource_type: taxonomy_term-parent highlight: weights: postprocess_query: 0 @@ -515,9 +493,9 @@ processor_settings: excerpt_length: 256 exclude_fields: - abstract_description_fulltext - - field_abstract - field_description - field_full_title + - linked_agent_name_fulltext - rendered_item - subject_aggregated_fulltext - title diff --git a/config/sync/views.view.solr_search_content.yml b/config/sync/views.view.solr_search_content.yml index 921c04715..4e6f5cf44 100644 --- a/config/sync/views.view.solr_search_content.yml +++ b/config/sync/views.view.solr_search_content.yml @@ -3,12 +3,10 @@ langcode: en status: true dependencies: config: - - field.storage.node.field_abstract - field.storage.node.field_description - search_api.index.default_solr_index module: - search_api - - text - views_field_view id: solr_search_content label: 'Solr search content' @@ -146,10 +144,8 @@ display: empty_zero: false hide_alter_empty: true click_sort_column: value - type: number_integer - settings: - thousand_separator: '' - prefix_suffix: true + type: number_unformatted + settings: { } group_column: value group_columns: { } group_rows: true @@ -571,14 +567,14 @@ display: use_highlighting: true multi_type: separator multi_separator: ', ' - field_abstract: - id: field_abstract + processed: + id: processed table: search_api_index_default_solr_index - field: field_abstract + field: processed relationship: none group_type: group admin_label: '' - plugin_id: search_api_field + plugin_id: search_api label: Abstract exclude: false alter: @@ -620,26 +616,10 @@ display: hide_empty: true empty_zero: false hide_alter_empty: true - click_sort_column: value - type: text_default - settings: { } - group_column: value - group_columns: { } - group_rows: true - delta_limit: 0 - delta_offset: 0 - delta_reversed: false - delta_first_last: false + link_to_item: false + use_highlighting: true multi_type: separator - separator: ', ' - field_api_classes: false - field_rendering: false - fallback_handler: search_api - fallback_options: - link_to_item: false - use_highlighting: true - multi_type: separator - multi_separator: ', ' + multi_separator: ', ' search_api_excerpt: id: search_api_excerpt table: search_api_index_default_solr_index @@ -754,7 +734,7 @@ display: expose: label: Relevance field_identifier: search_api_relevance - exposed: true + exposed: false title: id: title table: search_api_index_default_solr_index @@ -793,7 +773,6 @@ display: plugin_id: search_api_options operator: or value: - collection_object: collection_object islandora_object: islandora_object group: 1 exposed: false @@ -870,7 +849,6 @@ display: - 'url.query_args:sort_order' - 'user.node_grants:view' tags: - - 'config:field.storage.node.field_abstract' - 'config:field.storage.node.field_description' - 'config:search_api.index.default_solr_index' - 'search_api_list:default_solr_index' @@ -882,6 +860,46 @@ display: position: 2 display_options: title: 'Search within Collection' + sorts: + search_api_relevance: + id: search_api_relevance + table: search_api_index_default_solr_index + field: search_api_relevance + relationship: none + group_type: group + admin_label: '' + plugin_id: search_api + order: DESC + expose: + label: Relevance + field_identifier: search_api_relevance + exposed: false + title: + id: title + table: search_api_index_default_solr_index + field: title + relationship: none + group_type: group + admin_label: '' + plugin_id: search_api + order: ASC + expose: + label: Title + field_identifier: title + exposed: false + edtf_year: + id: edtf_year + table: search_api_index_default_solr_index + field: edtf_year + relationship: none + group_type: group + admin_label: '' + plugin_id: search_api + order: DESC + expose: + label: Year + field_identifier: edtf_year + exposed: false arguments: field_member_of: id: field_member_of @@ -947,6 +965,7 @@ display: not: false defaults: title: false + sorts: false arguments: false display_description: 'Searches and lists members of a collection.' display_extenders: @@ -969,11 +988,8 @@ display: - 'languages:language_interface' - url - url.query_args - - 'url.query_args:sort_by' - - 'url.query_args:sort_order' - 'user.node_grants:view' tags: - - 'config:field.storage.node.field_abstract' - 'config:field.storage.node.field_description' - 'config:search_api.index.default_solr_index' - 'search_api_list:default_solr_index' @@ -1008,7 +1024,6 @@ display: plugin_id: search_api_options operator: or value: - collection_object: collection_object islandora_object: islandora_object group: 1 exposed: false @@ -1073,7 +1088,6 @@ display: - 'url.query_args:sort_order' - 'user.node_grants:view' tags: - - 'config:field.storage.node.field_abstract' - 'config:field.storage.node.field_description' - 'config:search_api.index.default_solr_index' - 'search_api_list:default_solr_index' diff --git a/web/sites/default/default.services.yml b/web/sites/default/default.services.yml index b4d27e05a..5ab4ec957 100644 --- a/web/sites/default/default.services.yml +++ b/web/sites/default/default.services.yml @@ -147,14 +147,6 @@ parameters: # # @default [] tags: [] - # Renderer cache debug: - # - # Allows cache debugging output for each rendered element. - # - # Enabling render cache debugging is not recommended in production - # environments. - # @default false - debug: false # Cacheability debugging: # # Responses with cacheability metadata (CacheableResponseInterface instances) @@ -169,15 +161,15 @@ parameters: # @default false http.response.debug_cacheability_headers: false factory.keyvalue: {} - # Default key/value storage service to use. - # @default keyvalue.database - # default: keyvalue.database - # Collection-specific overrides. - # state: keyvalue.database + # Default key/value storage service to use. + # @default keyvalue.database + # default: keyvalue.database + # Collection-specific overrides. + # state: keyvalue.database factory.keyvalue.expirable: {} - # Default key/value expirable storage service to use. - # @default keyvalue.database.expirable - # default: keyvalue.database.expirable + # Default key/value expirable storage service to use. + # @default keyvalue.database.expirable + # default: keyvalue.database.expirable # Allowed protocols for URL generation. filter_protocols: - http @@ -194,18 +186,13 @@ parameters: - webcal - rtsp - # Configure Cross-Site HTTP requests (CORS). - # Read https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS - # for more information about the topic in general. - # Note: By default the configuration is disabled. cors.config: - enabled: false + enabled: true # Specify allowed headers, like 'x-allowed-header'. allowedHeaders: [] # Specify allowed request methods, specify ['*'] to allow all possible ones. allowedMethods: [] - # Configure requests allowed from specific origins. Do not include trailing - # slashes with URLs. + # Configure requests allowed from specific origins. allowedOrigins: ['*'] # Sets the Access-Control-Expose-Headers header. exposedHeaders: false