From 465ffe51c01e13e618cba80ad373e317779f15cf Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Mon, 10 May 2021 18:31:46 -0400 Subject: [PATCH 1/6] Quick fix for #7864 --- conf/solr/8.8.1/schema.xml | 161 ++++++++++++++++++++++- conf/solr/8.8.1/schema_dv_mdb_copies.xml | 161 ----------------------- 2 files changed, 159 insertions(+), 163 deletions(-) delete mode 100644 conf/solr/8.8.1/schema_dv_mdb_copies.xml diff --git a/conf/solr/8.8.1/schema.xml b/conf/solr/8.8.1/schema.xml index b0ecaba9c99..0090f201f72 100644 --- a/conf/solr/8.8.1/schema.xml +++ b/conf/solr/8.8.1/schema.xml @@ -291,8 +291,165 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From cb2ce23b16769eb94d6a18e1b03356b661139254 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 14 May 2021 11:13:43 -0400 Subject: [PATCH 4/6] release notes --- doc/release-notes/7865-simple-search-fix.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/release-notes/7865-simple-search-fix.md diff --git a/doc/release-notes/7865-simple-search-fix.md b/doc/release-notes/7865-simple-search-fix.md new file mode 100644 index 00000000000..b399370b8fa --- /dev/null +++ b/doc/release-notes/7865-simple-search-fix.md @@ -0,0 +1,8 @@ +### Simple Search Fix for Solr Configuration + +The introduction in v4.17 of a schema_dv_mdb_copies.xml file as part of the Solr configuration accidentally removed the contents of most metadata fields from index used for simple searches in Dataverse (i.e. when one types a word without indicating which field to search in the normal search box). This was somewhat ameliorated/hidden by the fact that many common fields such as description were still included by other means. + +This release removes the schema_dv_mdb_copies.xml file and includes the updates needed in the schema.xml file. Installations with no custom metadata blocks can simply replace their current schema.xml file for solr, restart Solr, and run a ['Reindex in Place' as described in the guides](https://guides.dataverse.org/en/latest/admin/solr-search-index.html#reindex-in-place). + +Installations using custom metadata blocks should manually copy the contents of their schema_dv_mdb_copies.xml file (excluding the enclosing `` element and only including the `` elements) into their schema.xml file, replacing the line +``. (It doesn't matter whether schema_dv_mdb_copies.xml was originally created manually or via the recommended updateSchemaMDB.sh script.) This fix will work with all prior versions of Dataverse from v4.17 on. Once schema.xml is updated, solr should be restarted and a ['Reindex in Place'](https://guides.dataverse.org/en/latest/admin/solr-search-index.html#reindex-in-place) will be required. (Future Dataverse versions will avoid this manual copy step.) \ No newline at end of file From 2551e8f07f153ad9c4ef92cd2fabb6579724f72d Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 14 May 2021 14:46:32 -0400 Subject: [PATCH 5/6] clarification in release notes --- doc/release-notes/7865-simple-search-fix.md | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/doc/release-notes/7865-simple-search-fix.md b/doc/release-notes/7865-simple-search-fix.md index b399370b8fa..0a48345856d 100644 --- a/doc/release-notes/7865-simple-search-fix.md +++ b/doc/release-notes/7865-simple-search-fix.md @@ -4,5 +4,18 @@ The introduction in v4.17 of a schema_dv_mdb_copies.xml file as part of the Solr This release removes the schema_dv_mdb_copies.xml file and includes the updates needed in the schema.xml file. Installations with no custom metadata blocks can simply replace their current schema.xml file for solr, restart Solr, and run a ['Reindex in Place' as described in the guides](https://guides.dataverse.org/en/latest/admin/solr-search-index.html#reindex-in-place). -Installations using custom metadata blocks should manually copy the contents of their schema_dv_mdb_copies.xml file (excluding the enclosing `` element and only including the `` elements) into their schema.xml file, replacing the line -``. (It doesn't matter whether schema_dv_mdb_copies.xml was originally created manually or via the recommended updateSchemaMDB.sh script.) This fix will work with all prior versions of Dataverse from v4.17 on. Once schema.xml is updated, solr should be restarted and a ['Reindex in Place'](https://guides.dataverse.org/en/latest/admin/solr-search-index.html#reindex-in-place) will be required. (Future Dataverse versions will avoid this manual copy step.) \ No newline at end of file +Installations using custom metadata blocks should manually copy the contents of their schema_dv_mdb_copies.xml file (excluding the enclosing `` element and only including the `` elements) into their schema.xml file, replacing the section between + +`` +and + +``. + +In existing schema.xml files, this section currently includes only one line: + +``. + +In this release, that line has already been replaced with the default set of ``. +It doesn't matter whether schema_dv_mdb_copies.xml was originally created manually or via the recommended updateSchemaMDB.sh script and this fix will work with all prior versions of Dataverse from v4.17 on. + +Once schema.xml is updated, solr should be restarted and a ['Reindex in Place'](https://guides.dataverse.org/en/latest/admin/solr-search-index.html#reindex-in-place) will be required. (Future Dataverse versions will avoid this manual copy step.) \ No newline at end of file From 233f5305b0890f2428b2af5097db9bfb9ad2602b Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 14 May 2021 14:54:51 -0400 Subject: [PATCH 6/6] address future change --- doc/release-notes/7865-simple-search-fix.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/release-notes/7865-simple-search-fix.md b/doc/release-notes/7865-simple-search-fix.md index 0a48345856d..5b068a7be03 100644 --- a/doc/release-notes/7865-simple-search-fix.md +++ b/doc/release-notes/7865-simple-search-fix.md @@ -16,6 +16,6 @@ In existing schema.xml files, this section currently includes only one line: ``. In this release, that line has already been replaced with the default set of ``. -It doesn't matter whether schema_dv_mdb_copies.xml was originally created manually or via the recommended updateSchemaMDB.sh script and this fix will work with all prior versions of Dataverse from v4.17 on. +It doesn't matter whether schema_dv_mdb_copies.xml was originally created manually or via the recommended updateSchemaMDB.sh script and this fix will work with all prior versions of Dataverse from v4.17 on. If you make further changes to metadata blocks in your installation, you can repeat this process (i.e. run updateSchemaMDB.sh, copy the entries in schema_dv_mdb_copies.xml into the same section of schema.xml, restart solr, and reindex.) Once schema.xml is updated, solr should be restarted and a ['Reindex in Place'](https://guides.dataverse.org/en/latest/admin/solr-search-index.html#reindex-in-place) will be required. (Future Dataverse versions will avoid this manual copy step.) \ No newline at end of file