Skip to content

Commit 2f311ad

Browse files
committed
Merge remote-tracking branch 'IQSS/develop' into IQSS/11418_poi_fix
2 parents 0340c16 + 5db10ea commit 2f311ad

40 files changed

Lines changed: 742 additions & 566 deletions

conf/solr/solrconfig.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@
238238
have some sort of hard autoCommit to limit the log size.
239239
-->
240240
<autoCommit>
241-
<maxTime>${solr.autoCommit.maxTime:30000}</maxTime>
241+
<maxTime>${solr.autoCommit.maxTime:300000}</maxTime>
242242
<openSearcher>false</openSearcher>
243243
</autoCommit>
244244

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
### Solr Indexing speed improved
2+
3+
The performance of Solr indexing has been significantly improved, particularly for datasets with many files.
4+
5+
A new dataverse.solr.min-files-to-use-proxy microprofile setting can be used to further improve performance/lower memory requirements for datasets with many files (e.g. 500+) (defaults to Integer.MAX, disabling use of the new functionality)
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
The `dataverse.files.hide-schema-dot-org-download-urls` setting now supports configuration via MicroProfile Config. 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 its value.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Unfortunately, the [Whole Tale](https://wholetale.org) project is no longer active and has been removed from the list of integrations in the Admin Guide.
Lines changed: 13 additions & 0 deletions
Loading

doc/sphinx-guides/source/_static/admin/dataverse-external-tools.tsv

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
Tool Type Scope Description
22
Data Explorer explore file "A GUI which lists the variables in a tabular data file allowing searching, charting and cross tabulation analysis. The latest version incorporates the Data Curation Tool, a GUI for curating data by adding labels, groups, weights and other details to assist with informed reuse. See the README.md file at https://github.com/scholarsportal/Dataverse-Data-Explorer for the instructions on adding Data Explorer to your Dataverse."
3-
Whole Tale explore dataset "A platform for the creation of reproducible research packages that allows users to launch containerized interactive analysis environments based on popular tools such as Jupyter and RStudio. Using this integration, Dataverse users can launch Jupyter and RStudio environments to analyze published datasets. For more information, see the `Whole Tale User Guide <https://wholetale.readthedocs.io/en/stable/users_guide/integration.html>`_."
43
Binder explore dataset Binder allows you to spin up custom computing environments in the cloud (including Jupyter notebooks) with the files from your dataset. See https://github.com/IQSS/dataverse-binder-redirect for installation instructions.
54
File Previewers explore file "A set of tools that display the content of files - including audio, html, `Hypothes.is <https://hypothes.is/>`_ annotations, images, PDF, Markdown, text, video, tabular data, spreadsheets, GeoJSON, zip, and NcML files - allowing them to be viewed without downloading the file. The previewers can be run directly from github.io, so the only required step is using the Dataverse API to register the ones you want to use. Documentation, including how to optionally brand the previewers, and an invitation to contribute through github are in the README.md file. Initial development was led by the Qualitative Data Repository and the spreasdheet previewer was added by the Social Sciences and Humanities Open Cloud (SSHOC) project. https://github.com/gdcc/dataverse-previewers"
65
Ask the Data query file Ask the Data is an experimental tool that allows you ask natural language questions about the data contained in Dataverse tables (tabular data). See the README.md file at https://github.com/IQSS/askdataverse/tree/main/askthedata for the instructions on adding Ask the Data to your Dataverse installation.

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -185,15 +185,6 @@ Compute Button
185185

186186
The "Compute" button is still highly experimental and has special requirements such as use of a Swift object store, but it is documented under "Setting up Compute" in the :doc:`/installation/config` section of the Installation Guide.
187187

188-
.. _wholetale:
189-
190-
Whole Tale
191-
++++++++++
192-
193-
`Whole Tale <https://wholetale.org>`_ enables researchers to analyze data using popular tools including Jupyter and RStudio with the ultimate goal of supporting publishing of reproducible research packages. Users can
194-
`import data from a Dataverse installation
195-
<https://wholetale.readthedocs.io/en/stable/users_guide/manage.html>`_ via identifier (e.g., DOI, URI, etc) or through the External Tools integration. For installation instructions, see the :doc:`external-tools` section or the `Integration <https://wholetale.readthedocs.io/en/stable/users_guide/integration.html#dataverse-external-tools>`_ section of the Whole Tale User Guide.
196-
197188
.. _binder:
198189

199190
Binder

doc/sphinx-guides/source/api/apps.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ https://github.com/IQSS/dataverse-metrics
6868
Whole Tale
6969
~~~~~~~~~~
7070

71-
Whole Tale enables researchers to analyze data using popular tools including Jupyter and RStudio with the ultimate goal of supporting publishing of reproducible research packages.
71+
Whole Tale enables researchers to analyze data using popular tools including Jupyter and RStudio with the ultimate goal of supporting publishing of reproducible research packages. As of 2025 the project is not active.
7272

73-
https://github.com/whole-tale/girder_wholetale/tree/v0.7/server/lib/dataverse
73+
https://github.com/whole-tale/girder-wholetale/blob/v2.0.7/girder_wholetale/lib/dataverse/provider.py
7474

7575
Archivematica
7676
~~~~~~~~~~~~~

doc/sphinx-guides/source/api/native-api.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1167,7 +1167,7 @@ To set or change the storage allocation quota for a collection:
11671167

11681168
.. code-block::
11691169
1170-
curl -X PUT -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/dataverses/$ID/storage/quota/$SIZE_IN_BYTES"
1170+
curl -X POST -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/dataverses/$ID/storage/quota/$SIZE_IN_BYTES"
11711171
11721172
This is API is superuser-only.
11731173

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2689,6 +2689,17 @@ when using it to configure your core name!
26892689

26902690
Can also be set via *MicroProfile Config API* sources, e.g. the environment variable ``DATAVERSE_SOLR_PATH``.
26912691

2692+
dataverse.solr.min-files-to-use-proxy
2693+
+++++++++++++++++++++++++++++++++++++
2694+
2695+
Specifies when to use a smaller datafile proxy object for the purposes of dataset indexing. This can lower memory requirements
2696+
and improve performance when reindexing large datasets (e.g. those with hundreds or thousands of files). (Creating the proxy may slightly slow indexing datasets with only a few files.)
2697+
2698+
This setting represents a number of files for which the datafile procy should be used. By default, this is set to Interger.MAX which disables using the proxy.
2699+
A recommended value would be ~1000 but the optimal value may vary depending on details of your installation.
2700+
2701+
Can also be set via *MicroProfile Config API* sources, e.g. the environment variable ``DATAVERSE_SOLR_MIN_FILES_TO_USE_PROXY``.
2702+
26922703
dataverse.solr.concurrency.max-async-indexes
26932704
++++++++++++++++++++++++++++++++++++++++++++
26942705

@@ -3053,6 +3064,9 @@ By default, download URLs to files will be included in Schema.org JSON-LD output
30533064

30543065
``./asadmin create-jvm-options '-Ddataverse.files.hide-schema-dot-org-download-urls=true'``
30553066

3067+
Can also be set via *MicroProfile Config API* sources, e.g. the environment
3068+
variable ``DATAVERSE_FILES_HIDE_SCHEMA_DOT_ORG_DOWNLOAD_URLS``.
3069+
30563070
For more on Schema.org JSON-LD, see the :doc:`/admin/metadataexport` section of the Admin Guide.
30573071

30583072
.. _useripaddresssourceheader:

0 commit comments

Comments
 (0)