From d8ffe4c396fea9bc1baa2daf43dc74db7ba49c0f Mon Sep 17 00:00:00 2001 From: Philipp Conzett Date: Mon, 19 Apr 2021 15:29:09 +0200 Subject: [PATCH 1/7] Update citation.tsv Turned allowmultiples facetable for Citation Metadata field Production Place from FALSE into TRUE as we'd like to be able to add multiple production places and to be able to filter dataset based on this metadata field. --- scripts/api/data/metadatablocks/citation.tsv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/api/data/metadatablocks/citation.tsv b/scripts/api/data/metadatablocks/citation.tsv index 375a8c67cec..fdbe40f998c 100644 --- a/scripts/api/data/metadatablocks/citation.tsv +++ b/scripts/api/data/metadatablocks/citation.tsv @@ -43,7 +43,7 @@ producerURL URL Producer URL points to the producer's web presence, if appropriate. Enter an absolute URL where the producer's web site is found, such as http://www.my.org. Enter full URL, starting with http:// url 39 #VALUE FALSE FALSE FALSE FALSE FALSE FALSE producer citation producerLogoURL Logo URL URL for the producer's logo, which points to this producer's web-accessible logo image. Enter an absolute URL where the producer's logo image is found, such as http://www.my.org/images/logo.gif. Enter full URL for image, starting with http:// url 40
FALSE FALSE FALSE FALSE FALSE FALSE producer citation productionDate Production Date Date when the data collection or other materials were produced (not distributed, published or archived). YYYY-MM-DD date 41 TRUE FALSE FALSE TRUE FALSE FALSE citation - productionPlace Production Place The location where the data collection and any other related materials were produced. text 42 FALSE FALSE FALSE FALSE FALSE FALSE citation + productionPlace Production Place The location where the data collection and any other related materials were produced. text 42 FALSE FALSE TRUE TRUE FALSE FALSE citation contributor Contributor The organization or person responsible for either collecting, managing, or otherwise contributing in some form to the development of the resource. none 43 : FALSE FALSE TRUE FALSE FALSE FALSE citation http://purl.org/dc/terms/contributor contributorType Type The type of contributor of the resource. text 44 #VALUE TRUE TRUE FALSE TRUE FALSE FALSE contributor citation contributorName Name The Family Name, Given Name or organization name of the contributor. FamilyName, GivenName or Organization text 45 #VALUE TRUE FALSE FALSE TRUE FALSE FALSE contributor citation From f3334f5d6df324046186803ae2ea8417e812d7b8 Mon Sep 17 00:00:00 2001 From: Philipp Conzett Date: Mon, 19 Apr 2021 15:46:34 +0200 Subject: [PATCH 2/7] Update citation.tsv Turning Citation Metadata section Series from allowmultiples=FALSE to allowmultiples=TRUE. --- scripts/api/data/metadatablocks/citation.tsv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/api/data/metadatablocks/citation.tsv b/scripts/api/data/metadatablocks/citation.tsv index fdbe40f998c..19fd9b404a5 100644 --- a/scripts/api/data/metadatablocks/citation.tsv +++ b/scripts/api/data/metadatablocks/citation.tsv @@ -66,7 +66,7 @@ dateOfCollectionStart Start Date when the data collection started. YYYY-MM-DD date 62 #NAME: #VALUE FALSE FALSE FALSE FALSE FALSE FALSE dateOfCollection citation dateOfCollectionEnd End Date when the data collection ended. YYYY-MM-DD date 63 #NAME: #VALUE FALSE FALSE FALSE FALSE FALSE FALSE dateOfCollection citation kindOfData Kind of Data Type of data included in the file: survey data, census/enumeration data, aggregate data, clinical data, event/transaction data, program source code, machine-readable text, administrative records data, experimental data, psychological test, textual data, coded textual, coded documents, time budget diaries, observation data/ratings, process-produced data, or other. text 64 TRUE FALSE TRUE TRUE FALSE FALSE citation http://rdf-vocabulary.ddialliance.org/discovery#kindOfData - series Series Information about the Dataset series. none 65 : FALSE FALSE FALSE FALSE FALSE FALSE citation + series Series Information about the Dataset series. none 65 : FALSE FALSE TRUE FALSE FALSE FALSE citation seriesName Name Name of the dataset series to which the Dataset belongs. text 66 #VALUE TRUE FALSE FALSE TRUE FALSE FALSE series citation seriesInformation Information History of the series and summary of those features that apply to the series as a whole. textbox 67 #VALUE FALSE FALSE FALSE FALSE FALSE FALSE series citation software Software Information about the software used to generate the Dataset. none 68 , FALSE FALSE TRUE FALSE FALSE FALSE citation https://www.w3.org/TR/prov-o/#wasGeneratedBy From 6060d5f2a76edbd8e9b5b48bb59cc1eaee20d87e Mon Sep 17 00:00:00 2001 From: Danny Brooke Date: Fri, 5 Nov 2021 11:35:53 -0400 Subject: [PATCH 3/7] adding release note --- doc/release-notes/7810-prod-place-and-series.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 doc/release-notes/7810-prod-place-and-series.md diff --git a/doc/release-notes/7810-prod-place-and-series.md b/doc/release-notes/7810-prod-place-and-series.md new file mode 100644 index 00000000000..65013767d2e --- /dev/null +++ b/doc/release-notes/7810-prod-place-and-series.md @@ -0,0 +1,6 @@ +## Upgrade Instructions + +X. Reload Citation Metadata Block: + + `wget https://github.com/IQSS/dataverse/releases/download/v5.X/citation.tsv` + `curl http://localhost:8080/api/admin/datasetfield/load -X POST --data-binary @citation.tsv -H "Content-type: text/tab-separated-values"` \ No newline at end of file From badf7d6a07f023e0b90130efc0619b90cfeb92d7 Mon Sep 17 00:00:00 2001 From: Danny Brooke Date: Fri, 5 Nov 2021 15:22:48 -0400 Subject: [PATCH 4/7] fixing error and rerunning tests --- doc/release-notes/7810-prod-place-and-series.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/release-notes/7810-prod-place-and-series.md b/doc/release-notes/7810-prod-place-and-series.md index 65013767d2e..5e3d2fafebb 100644 --- a/doc/release-notes/7810-prod-place-and-series.md +++ b/doc/release-notes/7810-prod-place-and-series.md @@ -3,4 +3,4 @@ X. Reload Citation Metadata Block: `wget https://github.com/IQSS/dataverse/releases/download/v5.X/citation.tsv` - `curl http://localhost:8080/api/admin/datasetfield/load -X POST --data-binary @citation.tsv -H "Content-type: text/tab-separated-values"` \ No newline at end of file + `curl http://localhost:8080/api/admin/datasetfield/load -X POST --data-binary @citation.tsv -H "Content-type: text/tab-separated-values"` From d83ba713b1301a843eb63270bf89463e0bb40752 Mon Sep 17 00:00:00 2001 From: Danny Brooke Date: Tue, 16 Nov 2021 20:35:51 -0500 Subject: [PATCH 5/7] update release note --- doc/release-notes/7810-prod-place-and-series.md | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/doc/release-notes/7810-prod-place-and-series.md b/doc/release-notes/7810-prod-place-and-series.md index 5e3d2fafebb..5b68f885016 100644 --- a/doc/release-notes/7810-prod-place-and-series.md +++ b/doc/release-notes/7810-prod-place-and-series.md @@ -1,6 +1,19 @@ ## Upgrade Instructions -X. Reload Citation Metadata Block: +X\. Reload Citation Metadata Block: `wget https://github.com/IQSS/dataverse/releases/download/v5.X/citation.tsv` `curl http://localhost:8080/api/admin/datasetfield/load -X POST --data-binary @citation.tsv -H "Content-type: text/tab-separated-values"` + +X\. Update Solr schema.xml. + +`/usr/local/solr/solr-8.8.1/server/solr/collection1/conf` is used in the examples below as the location of your Solr schema. Please adapt it to the correct location, if different in your installation. Use `find / -name schema.xml` if in doubt. + +X\. Replace `schema.xml` with the base version included in this release. + +``` + wget https://github.com/IQSS/dataverse/releases/download/v5.X/schema.xml + cp schema.xml /usr/local/solr/solr-8.8.1/server/solr/collection1/conf +``` + +X\. Run a ['Reindex in Place'](https://guides.dataverse.org/en/5.X/admin/solr-search-index.html#reindex-in-place) as described in the Dataverse Guides. \ No newline at end of file From 5c8ff66d14041981ec65cba1502c51aea56537dd Mon Sep 17 00:00:00 2001 From: Danny Brooke Date: Thu, 18 Nov 2021 12:24:50 -0500 Subject: [PATCH 6/7] updating release note, updating schema --- conf/solr/8.8.1/schema.xml | 4 ++-- doc/release-notes/7810-prod-place-and-series.md | 16 +++++++++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/conf/solr/8.8.1/schema.xml b/conf/solr/8.8.1/schema.xml index 1718962bfb8..1c15a0554d9 100644 --- a/conf/solr/8.8.1/schema.xml +++ b/conf/solr/8.8.1/schema.xml @@ -342,7 +342,7 @@ - + @@ -359,7 +359,7 @@ - + diff --git a/doc/release-notes/7810-prod-place-and-series.md b/doc/release-notes/7810-prod-place-and-series.md index 5b68f885016..cdfe52f955a 100644 --- a/doc/release-notes/7810-prod-place-and-series.md +++ b/doc/release-notes/7810-prod-place-and-series.md @@ -9,11 +9,25 @@ X\. Update Solr schema.xml. `/usr/local/solr/solr-8.8.1/server/solr/collection1/conf` is used in the examples below as the location of your Solr schema. Please adapt it to the correct location, if different in your installation. Use `find / -name schema.xml` if in doubt. -X\. Replace `schema.xml` with the base version included in this release. +Xa\. Replace `schema.xml` with the base version included in this release. ``` wget https://github.com/IQSS/dataverse/releases/download/v5.X/schema.xml cp schema.xml /usr/local/solr/solr-8.8.1/server/solr/collection1/conf ``` +For installations that are not using any Custom Metadata Blocks, **you can skip the next step**. + +Xb\. For installations with Custom Metadata Blocks + +Use the script provided in the release to add the custom fields to the base `schema.xml` installed in the previous step. + +``` + wget https://github.com/IQSS/dataverse/releases/download/v5.X/update-fields.sh + chmod +x update-fields.sh + curl "http://localhost:8080/api/admin/index/solr/schema" | ./update-fields.sh /usr/local/solr/solr-8.8.1/server/solr/collection1/conf/schema.xml +``` + +(Note that the curl command above calls the admin api on `localhost` to obtain the list of the custom fields. In the unlikely case that you are running the main Dataverse Application and Solr on different servers, generate the `schema.xml` on the application node, then copy it onto the Solr server) + X\. Run a ['Reindex in Place'](https://guides.dataverse.org/en/5.X/admin/solr-search-index.html#reindex-in-place) as described in the Dataverse Guides. \ No newline at end of file From 4509dea9b5aa2958fbe2535d1f80435ab7412d1f Mon Sep 17 00:00:00 2001 From: Philip Durbin Date: Mon, 22 Nov 2021 09:49:33 -0500 Subject: [PATCH 7/7] update schema.xml from API output #7810 Updating from the API output picked up the missing subfields of "series" which is a compound field. --- conf/solr/8.8.1/schema.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/solr/8.8.1/schema.xml b/conf/solr/8.8.1/schema.xml index 1c15a0554d9..2653b022d31 100644 --- a/conf/solr/8.8.1/schema.xml +++ b/conf/solr/8.8.1/schema.xml @@ -360,8 +360,8 @@ - - + +