diff --git a/composer.json b/composer.json index 19de17767..b448ecaa6 100755 --- a/composer.json +++ b/composer.json @@ -35,6 +35,7 @@ "drupal/better_exposed_filters": "^6.0", "drupal/bibcite": "^2.0@beta", "drupal/citation_select": "^1.0@beta", + "drupal/coi": "^4.0", "drupal/config_update": "^2.0@alpha", "drupal/context": "^5@RC", "drupal/controlled_access_terms": "^2", diff --git a/composer.lock b/composer.lock index f8bd26a4f..25f621af9 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": "770f076837673b1a39bbc0a805016da3", + "content-hash": "0db3582c1e59ecbc37162c1048ca9e5f", "packages": [ { "name": "academicpuma/citeproc-php", @@ -1857,6 +1857,107 @@ "source": "https://git.drupalcode.org/project/citation_select" } }, + { + "name": "drupal/coi", + "version": "4.0.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/coi.git", + "reference": "4.0.0" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/coi-4.0.0.zip", + "reference": "4.0.0", + "shasum": "1a77866371a3dae553e5861f95ba2e26c76c0055" + }, + "require": { + "drupal/config_override_core_fields": "^4", + "drupal/core": "^10", + "php": ">=8.1" + }, + "suggest": { + "drupal/token": "Shows Token UI on COI settings form." + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "4.0.0", + "datestamp": "1693238227", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "Daniel Phin", + "homepage": "http://danielph.in", + "email": "pro@danielph.in", + "role": "Maintainer" + } + ], + "homepage": "https://www.drupal.org/project/coi", + "support": { + "source": "https://github.com/dpi/coi", + "issues": "https://github.com/dpi/coi/issues" + } + }, + { + "name": "drupal/config_override_core_fields", + "version": "4.0.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/config_override_core_fields.git", + "reference": "4.0.0" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/config_override_core_fields-4.0.0.zip", + "reference": "4.0.0", + "shasum": "db281661d21907f711946848bf2f97fd2304a36a" + }, + "require": { + "drupal/core": ">=10", + "php": ">=8.1" + }, + "require-dev": { + "drupal/coi": ">=4" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "4.0.0", + "datestamp": "1693238348", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "Daniel Phin", + "homepage": "http://danielph.in", + "email": "pro@danielph.in", + "role": "Maintainer" + } + ], + "homepage": "https://www.drupal.org/project/config_override_core_fields", + "support": { + "source": "https://github.com/dpi/config_override_core_fields", + "issues": "https://github.com/dpi/config_override_core_fields/issues" + } + }, { "name": "drupal/config_update", "version": "2.0.0-alpha3", diff --git a/config/sync/coi.settings.yml b/config/sync/coi.settings.yml new file mode 100644 index 000000000..7447cd958 --- /dev/null +++ b/config/sync/coi.settings.yml @@ -0,0 +1,13 @@ +_core: + default_config_hash: bO--lQ6KgJ0tb7_TBJybomU61yvfcSyI5qRzOxpLFvE +override_behavior: disable +message: + enabled: true + template: 'This field is overridden by settings.php configuration.' +overridden_value: + enabled: true + element: true + secrets: false +styling: + selectors: true + default: true diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index 6c83db215..2424bbead 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -14,8 +14,10 @@ module: breakpoint: 0 citation_select: 0 ckeditor5: 0 + coi: 0 comment: 0 config: 0 + config_override_core_fields: 0 config_update: 0 contact: 0 context: 0 diff --git a/config/sync/search_api_solr.solr_field_type.text_en_6_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_en_6_0_0.yml index ada959e58..47799298e 100644 --- a/config/sync/search_api_solr.solr_field_type.text_en_6_0_0.yml +++ b/config/sync/search_api_solr.solr_field_type.text_en_6_0_0.yml @@ -14,6 +14,7 @@ field_type: name: text_en class: solr.TextField positionIncrementGap: 100 + storeOffsetsWithPositions: true analyzers: - type: index @@ -90,11 +91,11 @@ field_type: language: English - class: solr.RemoveDuplicatesTokenFilterFactory - storeOffsetsWithPositions: true unstemmed_field_type: name: text_unstemmed_en class: solr.TextField positionIncrementGap: 100 + storeOffsetsWithPositions: true analyzers: - type: index @@ -163,7 +164,6 @@ unstemmed_field_type: class: solr.LowerCaseFilterFactory - class: solr.RemoveDuplicatesTokenFilterFactory - storeOffsetsWithPositions: true spellcheck_field_type: null collated_field_type: name: collated_en diff --git a/config/sync/search_api_solr.solr_field_type.text_en_7_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_en_7_0_0.yml index fb198f4c1..a8b897ad8 100644 --- a/config/sync/search_api_solr.solr_field_type.text_en_7_0_0.yml +++ b/config/sync/search_api_solr.solr_field_type.text_en_7_0_0.yml @@ -14,6 +14,7 @@ field_type: name: text_en class: solr.TextField positionIncrementGap: 100 + storeOffsetsWithPositions: true analyzers: - type: index @@ -92,11 +93,11 @@ field_type: language: English - class: solr.RemoveDuplicatesTokenFilterFactory - storeOffsetsWithPositions: true unstemmed_field_type: name: text_unstemmed_en class: solr.TextField positionIncrementGap: 100 + storeOffsetsWithPositions: true analyzers: - type: index @@ -167,7 +168,6 @@ unstemmed_field_type: class: solr.LowerCaseFilterFactory - class: solr.RemoveDuplicatesTokenFilterFactory - storeOffsetsWithPositions: true spellcheck_field_type: null collated_field_type: name: collated_en diff --git a/config/sync/search_api_solr.solr_field_type.text_phonetic_en_7_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_phonetic_en_7_0_0.yml index 94615ec4a..a63abc509 100644 --- a/config/sync/search_api_solr.solr_field_type.text_phonetic_en_7_0_0.yml +++ b/config/sync/search_api_solr.solr_field_type.text_phonetic_en_7_0_0.yml @@ -14,6 +14,7 @@ field_type: name: text_phonetic_en class: solr.TextField positionIncrementGap: 100 + storeOffsetsWithPositions: true analyzers: - type: index @@ -83,7 +84,6 @@ field_type: concat: true - class: solr.RemoveDuplicatesTokenFilterFactory - storeOffsetsWithPositions: true unstemmed_field_type: null spellcheck_field_type: null collated_field_type: null diff --git a/config/sync/search_api_solr.solr_field_type.text_und_6_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_und_6_0_0.yml index fac2b30fe..1acd29194 100644 --- a/config/sync/search_api_solr.solr_field_type.text_und_6_0_0.yml +++ b/config/sync/search_api_solr.solr_field_type.text_und_6_0_0.yml @@ -58,9 +58,9 @@ field_type: filters: - class: solr.SynonymFilterFactory + ignoreCase: true synonyms: synonyms_und.txt expand: true - ignoreCase: true - class: solr.StopFilterFactory ignoreCase: true @@ -190,8 +190,6 @@ solr_configs: text_files: stopwords: | - synonyms: | - drupal, durpal protwords: | accents: | @@ -343,3 +341,5 @@ text_files: "\uFB05" => "st" # st => st "\uFB06" => "st" + synonyms: | + drupal, durpal diff --git a/config/sync/search_api_solr.solr_field_type.text_und_7_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_und_7_0_0.yml index 64bf7087f..fe389e322 100644 --- a/config/sync/search_api_solr.solr_field_type.text_und_7_0_0.yml +++ b/config/sync/search_api_solr.solr_field_type.text_und_7_0_0.yml @@ -60,9 +60,9 @@ field_type: filters: - class: solr.SynonymGraphFilterFactory + ignoreCase: true synonyms: synonyms_und.txt expand: true - ignoreCase: true - class: solr.StopFilterFactory ignoreCase: true @@ -192,8 +192,6 @@ solr_configs: text_files: stopwords: | - synonyms: | - drupal, durpal protwords: | accents: | @@ -345,3 +343,5 @@ text_files: "\uFB05" => "st" # st => st "\uFB06" => "st" + synonyms: | + drupal, durpal