Skip to content

Commit 694b4a1

Browse files
committed
Merge branch 'develop' into 11695-change-api-get-storage-driver
2 parents 4ca3f33 + 6275ea9 commit 694b4a1

40 files changed

Lines changed: 4498 additions & 113 deletions
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
The settings `dataverse.personOrOrg.assumeCommaInPersonName` and `dataverse.personOrOrg.orgPhraseArray` now support configuration via MicroProfile Config.
2+
3+
They have been renamed to `dataverse.person-or-org.assume-comma-in-person-name` and `dataverse.person-or-org.org-phrase-array` for consistency with naming conventions.
4+
5+
In addition to the existing `asadmin` JVM option method, any [supported MicroProfile Config API source](https://docs.payara.fish/community/docs/Technical%20Documentation/MicroProfile/Config/Overview.html) can now be used to set their values.
6+
7+
For backwards compatibility, `dataverse.personOrOrg.assumeCommaInPersonName` is still supported. However, `dataverse.personOrOrg.orgPhraseArray` is not, due to a change in the expected value format. `dataverse.person-or-org.org-phrase-array` now expects a comma-separated list of phrases as a value instead of a JsonArray of strings. Please update both the name and value format if using the old setting.

doc/release-notes/11632-commons-lang3-update.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,19 @@ Due to changes in how the commons-lang3 library handles a non-ascii chararacter,
22

33
controlledvocabulary.language.magɨ_(madang_province) => controlledvocabulary.language.magi_(madang_province)
44
controlledvocabulary.language.magɨyi => controlledvocabulary.language.magiyi
5+
6+
## Upgrade Instructions
7+
8+
x\. Update metadata blocks
9+
10+
These changes reflect incremental improvements made to the handling of core metadata fields.
11+
12+
Reload the citation.tsv file to handle the commons-lang3 change mentioned above.
13+
14+
Expect the loading of the citation block to take several seconds because of its size (especially due to the number of languages).
15+
16+
```shell
17+
wget https://raw.githubusercontent.com/IQSS/dataverse/v6.8/scripts/api/data/metadatablocks/citation.tsv
18+
19+
curl http://localhost:8080/api/admin/datasetfield/load -H "Content-type: text/tab-separated-values" -X POST --upload-file citation.tsv
20+
```

doc/sphinx-guides/source/admin/metadataexport.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,5 +65,5 @@ Two exporters - Schema.org JSONLD and OpenAire - use an algorithm to determine w
6565

6666
The Dataverse software implements two jvm-options that can be used to tune the algorithm:
6767

68-
- :ref:`dataverse.personOrOrg.assumeCommaInPersonName` - boolean, default false. If true, Dataverse will assume any name without a comma must be an organization. This may be most useful for curated Dataverse instances that enforce the "family name, given name" convention.
69-
- :ref:`dataverse.personOrOrg.orgPhraseArray` - a JsonArray of strings. Any name that contains one of the strings is assumed to be an organization. For example, "Project" is a word that is not otherwise associated with being an organization.
68+
- :ref:`dataverse.person-or-org.assume-comma-in-person-name` - boolean, default false. If true, Dataverse will assume any name without a comma must be an organization. This may be most useful for curated Dataverse instances that enforce the "family name, given name" convention.
69+
- :ref:`dataverse.person-or-org.org-phrase-array` - a JsonArray of strings. Any name that contains one of the strings is assumed to be an organization. For example, "Project" is a word that is not otherwise associated with being an organization.

doc/sphinx-guides/source/installation/config.rst

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3163,27 +3163,36 @@ This setting is useful in cases such as running your Dataverse installation behi
31633163
"HTTP_VIA",
31643164
"REMOTE_ADDR"
31653165
3166-
.. _dataverse.personOrOrg.assumeCommaInPersonName:
3166+
.. _dataverse.person-or-org.assume-comma-in-person-name:
31673167

3168-
dataverse.personOrOrg.assumeCommaInPersonName
3169-
+++++++++++++++++++++++++++++++++++++++++++++
3168+
dataverse.person-or-org.assume-comma-in-person-name
3169+
+++++++++++++++++++++++++++++++++++++++++++++++++++
31703170

31713171
Please note that this setting is experimental.
31723172

31733173
The Schema.org metadata and OpenAIRE exports and the Schema.org metadata included in DatasetPages try to infer whether each entry in the various fields (e.g. Author, Contributor) is a Person or Organization. If you are sure that
31743174
users are following the guidance to add people in the recommended family name, given name order, with a comma, you can set this true to always assume entries without a comma are for Organizations. The default is false.
31753175

3176-
.. _dataverse.personOrOrg.orgPhraseArray:
3176+
``./asadmin create-jvm-options '-Ddataverse.person-or-org.assume-comma-in-person-name=true'``
31773177

3178-
dataverse.personOrOrg.orgPhraseArray
3179-
++++++++++++++++++++++++++++++++++++
3178+
Can also be set via *MicroProfile Config API* sources, e.g. the environment variable ``DATAVERSE_PERSON_OR_ORG_ASSUME_COMMA_IN_PERSON_NAME``.
3179+
3180+
**Note:** This setting was previously called `dataverse.personOrOrg.assumeCommaInPersonName`, which is still available as an alias for backwards compatiblity.
3181+
3182+
.. _dataverse.person-or-org.org-phrase-array:
3183+
3184+
dataverse.person-or-org.org-phrase-array
3185+
++++++++++++++++++++++++++++++++++++++++
31803186

31813187
Please note that this setting is experimental.
31823188

31833189
The Schema.org metadata and OpenAIRE exports and the Schema.org metadata included in DatasetPages try to infer whether each entry in the various fields (e.g. Author, Contributor) is a Person or Organization.
31843190
If you have examples where an orgization name is being inferred to belong to a person, you can use this setting to force it to be recognized as an organization.
3185-
The value is expected to be a JsonArray of strings. Any name that contains one of the strings is assumed to be an organization. For example, "Project" is a word that is not otherwise associated with being an organization.
3191+
The value is expected to be a comma-separated list of strings. Any name that contains one of the strings is assumed to be an organization. For example, "Project" is a word that is not otherwise associated with being an organization.
3192+
3193+
Can also be set via *MicroProfile Config API* sources, e.g. the environment variable ``DATAVERSE_PERSON_OR_ORG_ORG_PHRASE_ARRAY``.
31863194

3195+
**Note:** This setting was previously called `dataverse.personOrOrg.orgPhraseArray` and expected a JsonArray of strings. Please update both the name and value format if using the old setting.
31873196

31883197
.. _dataverse.api.signature-secret:
31893198

0 commit comments

Comments
 (0)