Skip to content

Commit 71f6be2

Browse files
janvanmansumjanvanmansum
committed
Merged back develop
2 parents 83b21f0 + a875db7 commit 71f6be2

162 files changed

Lines changed: 4430 additions & 2537 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/guides_build_sphinx.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: "Guides Build Status"
2+
on:
3+
pull_request:
4+
paths:
5+
- 'doc/sphinx-guides/**/*.rst'
6+
7+
jobs:
8+
docs:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v2
12+
- uses: ammaraskar/sphinx-action@master
13+
with:
14+
docs-folder: "doc/sphinx-guides/"

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ Dataverse is a trademark of President and Fellows of Harvard College and is regi
2121
[![API Test Coverage](https://img.shields.io/jenkins/coverage/jacoco?jobUrl=https%3A%2F%2Fjenkins.dataverse.org%2Fjob%2FIQSS-dataverse-develop&label=API%20Test%20Coverage)](https://jenkins.dataverse.org/job/IQSS-dataverse-develop/ws/target/coverage-it/index.html)
2222
[![Unit Test Status](https://img.shields.io/travis/IQSS/dataverse?label=Unit%20Test%20Status)](https://travis-ci.org/IQSS/dataverse)
2323
[![Unit Test Coverage](https://img.shields.io/coveralls/github/IQSS/dataverse?label=Unit%20Test%20Coverage)](https://coveralls.io/github/IQSS/dataverse?branch=develop)
24+
[![Guides Build Status](https://github.com/IQSS/dataverse/actions/workflows/guides_build_sphinx.yml/badge.svg)](https://github.com/IQSS/dataverse/actions/workflows/guides_build_sphinx.yml)
2425

2526
[dataverse.org]: https://dataverse.org
2627
[demo.dataverse.org]: https://demo.dataverse.org

‎checkstyle.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,9 @@
9797
<property name="excludes" value="lombok,java.util,org.springframework.web.bind.annotation"/>
9898
</module>
9999
-->
100-
<!-- <module name="IllegalImport"/> --> <!-- defaults to sun.* packages -->
100+
<module name="IllegalImport">
101+
<property name="illegalPkgs" value="org.apache.commons.lang"/>
102+
</module>
101103
<!-- <module name="RedundantImport"/> -->
102104
<!-- <module name="UnusedImports">
103105
<property name="processJavadoc" value="false"/>

‎conf/solr/8.8.1/schema.xml‎

Lines changed: 160 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -291,9 +291,166 @@
291291
<!-- <copyField source="*_i" dest="_text_" maxChars="3000"/> -->
292292

293293
<!-- Dataverse copyField from http://localhost:8080/api/admin/index/solr/schema -->
294-
<xi:include href="schema_dv_mdb_copies.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
295-
296-
<!-- End: Dataverse-specific -->
294+
<copyField source="accessToSources" dest="_text_" maxChars="3000"/>
295+
<copyField source="actionsToMinimizeLoss" dest="_text_" maxChars="3000"/>
296+
<copyField source="alternativeTitle" dest="_text_" maxChars="3000"/>
297+
<copyField source="alternativeURL" dest="_text_" maxChars="3000"/>
298+
<copyField source="astroFacility" dest="_text_" maxChars="3000"/>
299+
<copyField source="astroInstrument" dest="_text_" maxChars="3000"/>
300+
<copyField source="astroObject" dest="_text_" maxChars="3000"/>
301+
<copyField source="astroType" dest="_text_" maxChars="3000"/>
302+
<copyField source="author" dest="_text_" maxChars="3000"/>
303+
<copyField source="authorAffiliation" dest="_text_" maxChars="3000"/>
304+
<copyField source="authorIdentifier" dest="_text_" maxChars="3000"/>
305+
<copyField source="authorIdentifierScheme" dest="_text_" maxChars="3000"/>
306+
<copyField source="authorName" dest="_text_" maxChars="3000"/>
307+
<copyField source="characteristicOfSources" dest="_text_" maxChars="3000"/>
308+
<copyField source="city" dest="_text_" maxChars="3000"/>
309+
<copyField source="cleaningOperations" dest="_text_" maxChars="3000"/>
310+
<copyField source="collectionMode" dest="_text_" maxChars="3000"/>
311+
<copyField source="collectorTraining" dest="_text_" maxChars="3000"/>
312+
<copyField source="contributor" dest="_text_" maxChars="3000"/>
313+
<copyField source="contributorName" dest="_text_" maxChars="3000"/>
314+
<copyField source="contributorType" dest="_text_" maxChars="3000"/>
315+
<copyField source="controlOperations" dest="_text_" maxChars="3000"/>
316+
<copyField source="country" dest="_text_" maxChars="3000"/>
317+
<copyField source="coverage.Depth" dest="_text_" maxChars="3000"/>
318+
<copyField source="coverage.ObjectCount" dest="_text_" maxChars="3000"/>
319+
<copyField source="coverage.ObjectDensity" dest="_text_" maxChars="3000"/>
320+
<copyField source="coverage.Polarization" dest="_text_" maxChars="3000"/>
321+
<copyField source="coverage.Redshift.MaximumValue" dest="_text_" maxChars="3000"/>
322+
<copyField source="coverage.Redshift.MinimumValue" dest="_text_" maxChars="3000"/>
323+
<copyField source="coverage.RedshiftValue" dest="_text_" maxChars="3000"/>
324+
<copyField source="coverage.SkyFraction" dest="_text_" maxChars="3000"/>
325+
<copyField source="coverage.Spatial" dest="_text_" maxChars="3000"/>
326+
<copyField source="coverage.Spectral.Bandpass" dest="_text_" maxChars="3000"/>
327+
<copyField source="coverage.Spectral.CentralWavelength" dest="_text_" maxChars="3000"/>
328+
<copyField source="coverage.Spectral.MaximumWavelength" dest="_text_" maxChars="3000"/>
329+
<copyField source="coverage.Spectral.MinimumWavelength" dest="_text_" maxChars="3000"/>
330+
<copyField source="coverage.Spectral.Wavelength" dest="_text_" maxChars="3000"/>
331+
<copyField source="coverage.Temporal" dest="_text_" maxChars="3000"/>
332+
<copyField source="coverage.Temporal.StartTime" dest="_text_" maxChars="3000"/>
333+
<copyField source="coverage.Temporal.StopTime" dest="_text_" maxChars="3000"/>
334+
<copyField source="dataCollectionSituation" dest="_text_" maxChars="3000"/>
335+
<copyField source="dataCollector" dest="_text_" maxChars="3000"/>
336+
<copyField source="dataSources" dest="_text_" maxChars="3000"/>
337+
<copyField source="datasetContact" dest="_text_" maxChars="3000"/>
338+
<copyField source="datasetContactAffiliation" dest="_text_" maxChars="3000"/>
339+
<copyField source="datasetContactEmail" dest="_text_" maxChars="3000"/>
340+
<copyField source="datasetContactName" dest="_text_" maxChars="3000"/>
341+
<copyField source="datasetLevelErrorNotes" dest="_text_" maxChars="3000"/>
342+
<copyField source="dateOfCollection" dest="_text_" maxChars="3000"/>
343+
<copyField source="dateOfCollectionEnd" dest="_text_" maxChars="3000"/>
344+
<copyField source="dateOfCollectionStart" dest="_text_" maxChars="3000"/>
345+
<copyField source="dateOfDeposit" dest="_text_" maxChars="3000"/>
346+
<copyField source="depositor" dest="_text_" maxChars="3000"/>
347+
<copyField source="deviationsFromSampleDesign" dest="_text_" maxChars="3000"/>
348+
<copyField source="distributionDate" dest="_text_" maxChars="3000"/>
349+
<copyField source="distributor" dest="_text_" maxChars="3000"/>
350+
<copyField source="distributorAbbreviation" dest="_text_" maxChars="3000"/>
351+
<copyField source="distributorAffiliation" dest="_text_" maxChars="3000"/>
352+
<copyField source="distributorLogoURL" dest="_text_" maxChars="3000"/>
353+
<copyField source="distributorName" dest="_text_" maxChars="3000"/>
354+
<copyField source="distributorURL" dest="_text_" maxChars="3000"/>
355+
<copyField source="dsDescription" dest="_text_" maxChars="3000"/>
356+
<copyField source="dsDescriptionDate" dest="_text_" maxChars="3000"/>
357+
<copyField source="dsDescriptionValue" dest="_text_" maxChars="3000"/>
358+
<copyField source="eastLongitude" dest="_text_" maxChars="3000"/>
359+
<copyField source="frequencyOfDataCollection" dest="_text_" maxChars="3000"/>
360+
<copyField source="geographicBoundingBox" dest="_text_" maxChars="3000"/>
361+
<copyField source="geographicCoverage" dest="_text_" maxChars="3000"/>
362+
<copyField source="geographicUnit" dest="_text_" maxChars="3000"/>
363+
<copyField source="grantNumber" dest="_text_" maxChars="3000"/>
364+
<copyField source="grantNumberAgency" dest="_text_" maxChars="3000"/>
365+
<copyField source="grantNumberValue" dest="_text_" maxChars="3000"/>
366+
<copyField source="journalArticleType" dest="_text_" maxChars="3000"/>
367+
<copyField source="journalIssue" dest="_text_" maxChars="3000"/>
368+
<copyField source="journalPubDate" dest="_text_" maxChars="3000"/>
369+
<copyField source="journalVolume" dest="_text_" maxChars="3000"/>
370+
<copyField source="journalVolumeIssue" dest="_text_" maxChars="3000"/>
371+
<copyField source="keyword" dest="_text_" maxChars="3000"/>
372+
<copyField source="keywordValue" dest="_text_" maxChars="3000"/>
373+
<copyField source="keywordVocabulary" dest="_text_" maxChars="3000"/>
374+
<copyField source="keywordVocabularyURI" dest="_text_" maxChars="3000"/>
375+
<copyField source="kindOfData" dest="_text_" maxChars="3000"/>
376+
<copyField source="language" dest="_text_" maxChars="3000"/>
377+
<copyField source="northLongitude" dest="_text_" maxChars="3000"/>
378+
<copyField source="notesText" dest="_text_" maxChars="3000"/>
379+
<copyField source="originOfSources" dest="_text_" maxChars="3000"/>
380+
<copyField source="otherDataAppraisal" dest="_text_" maxChars="3000"/>
381+
<copyField source="otherGeographicCoverage" dest="_text_" maxChars="3000"/>
382+
<copyField source="otherId" dest="_text_" maxChars="3000"/>
383+
<copyField source="otherIdAgency" dest="_text_" maxChars="3000"/>
384+
<copyField source="otherIdValue" dest="_text_" maxChars="3000"/>
385+
<copyField source="otherReferences" dest="_text_" maxChars="3000"/>
386+
<copyField source="producer" dest="_text_" maxChars="3000"/>
387+
<copyField source="producerAbbreviation" dest="_text_" maxChars="3000"/>
388+
<copyField source="producerAffiliation" dest="_text_" maxChars="3000"/>
389+
<copyField source="producerLogoURL" dest="_text_" maxChars="3000"/>
390+
<copyField source="producerName" dest="_text_" maxChars="3000"/>
391+
<copyField source="producerURL" dest="_text_" maxChars="3000"/>
392+
<copyField source="productionDate" dest="_text_" maxChars="3000"/>
393+
<copyField source="productionPlace" dest="_text_" maxChars="3000"/>
394+
<copyField source="publication" dest="_text_" maxChars="3000"/>
395+
<copyField source="publicationCitation" dest="_text_" maxChars="3000"/>
396+
<copyField source="publicationIDNumber" dest="_text_" maxChars="3000"/>
397+
<copyField source="publicationIDType" dest="_text_" maxChars="3000"/>
398+
<copyField source="publicationURL" dest="_text_" maxChars="3000"/>
399+
<copyField source="redshiftType" dest="_text_" maxChars="3000"/>
400+
<copyField source="relatedDatasets" dest="_text_" maxChars="3000"/>
401+
<copyField source="relatedMaterial" dest="_text_" maxChars="3000"/>
402+
<copyField source="researchInstrument" dest="_text_" maxChars="3000"/>
403+
<copyField source="resolution.Redshift" dest="_text_" maxChars="3000"/>
404+
<copyField source="resolution.Spatial" dest="_text_" maxChars="3000"/>
405+
<copyField source="resolution.Spectral" dest="_text_" maxChars="3000"/>
406+
<copyField source="resolution.Temporal" dest="_text_" maxChars="3000"/>
407+
<copyField source="responseRate" dest="_text_" maxChars="3000"/>
408+
<copyField source="samplingErrorEstimates" dest="_text_" maxChars="3000"/>
409+
<copyField source="samplingProcedure" dest="_text_" maxChars="3000"/>
410+
<copyField source="series" dest="_text_" maxChars="3000"/>
411+
<copyField source="seriesInformation" dest="_text_" maxChars="3000"/>
412+
<copyField source="seriesName" dest="_text_" maxChars="3000"/>
413+
<copyField source="socialScienceNotes" dest="_text_" maxChars="3000"/>
414+
<copyField source="socialScienceNotesSubject" dest="_text_" maxChars="3000"/>
415+
<copyField source="socialScienceNotesText" dest="_text_" maxChars="3000"/>
416+
<copyField source="socialScienceNotesType" dest="_text_" maxChars="3000"/>
417+
<copyField source="software" dest="_text_" maxChars="3000"/>
418+
<copyField source="softwareName" dest="_text_" maxChars="3000"/>
419+
<copyField source="softwareVersion" dest="_text_" maxChars="3000"/>
420+
<copyField source="southLongitude" dest="_text_" maxChars="3000"/>
421+
<copyField source="state" dest="_text_" maxChars="3000"/>
422+
<copyField source="studyAssayCellType" dest="_text_" maxChars="3000"/>
423+
<copyField source="studyAssayMeasurementType" dest="_text_" maxChars="3000"/>
424+
<copyField source="studyAssayOrganism" dest="_text_" maxChars="3000"/>
425+
<copyField source="studyAssayOtherMeasurmentType" dest="_text_" maxChars="3000"/>
426+
<copyField source="studyAssayOtherOrganism" dest="_text_" maxChars="3000"/>
427+
<copyField source="studyAssayPlatform" dest="_text_" maxChars="3000"/>
428+
<copyField source="studyAssayOtherPlatform" dest="_text_" maxChars="3000"/>
429+
<copyField source="studyAssayTechnologyType" dest="_text_" maxChars="3000"/>
430+
<copyField source="studyAssayOtherTechnologyType" dest="_text_" maxChars="3000"/>
431+
<copyField source="studyDesignType" dest="_text_" maxChars="3000"/>
432+
<copyField source="studyOtherDesignType" dest="_text_" maxChars="3000"/>
433+
<copyField source="studyFactorType" dest="_text_" maxChars="3000"/>
434+
<copyField source="studyOtherFactorType" dest="_text_" maxChars="3000"/>
435+
<copyField source="subject" dest="_text_" maxChars="3000"/>
436+
<copyField source="subtitle" dest="_text_" maxChars="3000"/>
437+
<copyField source="targetSampleActualSize" dest="_text_" maxChars="3000"/>
438+
<copyField source="targetSampleSize" dest="_text_" maxChars="3000"/>
439+
<copyField source="targetSampleSizeFormula" dest="_text_" maxChars="3000"/>
440+
<copyField source="timeMethod" dest="_text_" maxChars="3000"/>
441+
<copyField source="timePeriodCovered" dest="_text_" maxChars="3000"/>
442+
<copyField source="timePeriodCoveredEnd" dest="_text_" maxChars="3000"/>
443+
<copyField source="timePeriodCoveredStart" dest="_text_" maxChars="3000"/>
444+
<copyField source="title" dest="_text_" maxChars="3000"/>
445+
<copyField source="topicClassValue" dest="_text_" maxChars="3000"/>
446+
<copyField source="topicClassVocab" dest="_text_" maxChars="3000"/>
447+
<copyField source="topicClassVocabURI" dest="_text_" maxChars="3000"/>
448+
<copyField source="topicClassification" dest="_text_" maxChars="3000"/>
449+
<copyField source="unitOfAnalysis" dest="_text_" maxChars="3000"/>
450+
<copyField source="universe" dest="_text_" maxChars="3000"/>
451+
<copyField source="weighting" dest="_text_" maxChars="3000"/>
452+
<copyField source="westLongitude" dest="_text_" maxChars="3000"/>
453+
<!-- End: Dataverse-specific -->
297454

298455
<!-- This can be enabled, in case the client does not know what fields may be searched. It isn't enabled by default
299456
because it's very expensive to index everything twice. -->

0 commit comments

Comments
 (0)