Skip to content

Commit 7ae2b8d

Browse files
jo-poljo-pol
authored
Merge branch 'develop' into retention-npe
2 parents 40a8300 + a3da339 commit 7ae2b8d

111 files changed

Lines changed: 4011 additions & 699 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.

‎conf/solr/schema.xml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,9 +339,34 @@
339339
<field name="dsDescriptionValue" type="text_en" multiValued="true" stored="true" indexed="true"/>
340340
<field name="eastLongitude" type="text_en" multiValued="true" stored="true" indexed="true"/>
341341
<field name="frequencyOfDataCollection" type="text_en" multiValued="false" stored="true" indexed="true"/>
342+
<field name="geographicAxisDimensionProperties" type="text_en" multiValued="true" stored="true" indexed="true"/>
342343
<field name="geographicBoundingBox" type="text_en" multiValued="true" stored="true" indexed="true"/>
344+
<field name="geographicCellGeometry" type="text_en" multiValued="false" stored="true" indexed="true"/>
343345
<field name="geographicCoverage" type="text_en" multiValued="true" stored="true" indexed="true"/>
346+
<field name="geographicDataLineageStatement" type="text_en" multiValued="false" stored="true" indexed="true"/>
347+
<field name="geographicDimensionNameType" type="text_en" multiValued="true" stored="true" indexed="true"/>
348+
<field name="geographicDimensionSize" type="plong" multiValued="true" stored="true" indexed="true"/>
349+
<field name="geographicDistribution" type="text_en" multiValued="true" stored="true" indexed="true"/>
350+
<field name="geographicDistributionLink" type="text_en" multiValued="true" stored="true" indexed="true"/>
351+
<field name="geographicDistributionLinkLabel" type="text_en" multiValued="true" stored="true" indexed="true"/>
352+
<field name="geographicNumberOfDimensions" type="plong" multiValued="false" stored="true" indexed="true"/>
353+
<field name="geographicProcessStep" type="text_en" multiValued="true" stored="true" indexed="true"/>
354+
<field name="geographicProtocol" type="text_en" multiValued="true" stored="true" indexed="true"/>
355+
<field name="geographicReferenceDate" type="text_en" multiValued="true" stored="true" indexed="true"/>
356+
<field name="geographicReferenceDateType" type="text_en" multiValued="true" stored="true" indexed="true"/>
357+
<field name="geographicReferenceDateValue" type="date_range" multiValued="true" stored="true" indexed="true"/> <field name="geographicReferenceSystemCode" type="text_en" multiValued="true" stored="true" indexed="true"/>
358+
<field name="geographicReferenceSystemCodeSpace" type="text_en" multiValued="true" stored="true" indexed="true"/>
359+
<field name="geographicReferenceSystemInfo" type="text_en" multiValued="true" stored="true" indexed="true"/>
360+
<field name="geographicResolution" type="pdouble" multiValued="true" stored="true" indexed="true"/>
361+
<field name="geographicResolutionUnitOfMeasure" type="text_en" multiValued="true" stored="true" indexed="true"/> <field name="geographicResourceType" type="text_en" multiValued="false" stored="true" indexed="true"/>
362+
<field name="geographicSpatialRepresentationType" type="text_en" multiValued="false" stored="true" indexed="true"/>
363+
<field name="geographicSpatialResolution" type="text_en" multiValued="true" stored="true" indexed="true"/>
364+
<field name="geographicSpatialResolutionType" type="text_en" multiValued="true" stored="true" indexed="true"/>
365+
<field name="geographicSpatialResolutionValue" type="text_en" multiValued="true" stored="true" indexed="true"/>
366+
<field name="geographicSpatialResolutionUnitOfMeasure" type="text_en" multiValued="true" stored="true" indexed="true"/>
344367
<field name="geographicUnit" type="text_en" multiValued="true" stored="true" indexed="true"/>
368+
<field name="geometricObjectCount" type="plong" multiValued="false" stored="true" indexed="true"/>
369+
<field name="geometricObjectType" type="text_en" multiValued="false" stored="true" indexed="true"/>
345370
<field name="grantNumber" type="text_en" multiValued="true" stored="true" indexed="true"/>
346371
<field name="grantNumberAgency" type="text_en" multiValued="true" stored="true" indexed="true"/>
347372
<field name="grantNumberValue" type="text_en" multiValued="true" stored="true" indexed="true"/>
@@ -596,9 +621,34 @@
596621
<copyField source="dsDescriptionValue" dest="_text_" maxChars="3000"/>
597622
<copyField source="eastLongitude" dest="_text_" maxChars="3000"/>
598623
<copyField source="frequencyOfDataCollection" dest="_text_" maxChars="3000"/>
624+
<copyField source="geographicAxisDimensionProperties" dest="_text_" maxChars="3000"/>
599625
<copyField source="geographicBoundingBox" dest="_text_" maxChars="3000"/>
626+
<copyField source="geographicCellGeometry" dest="_text_" maxChars="3000"/>
600627
<copyField source="geographicCoverage" dest="_text_" maxChars="3000"/>
628+
<copyField source="geographicDataLineageStatement" dest="_text_" maxChars="3000"/>
629+
<copyField source="geographicDimensionNameType" dest="_text_" maxChars="3000"/>
630+
<copyField source="geographicDimensionSize" dest="_text_" maxChars="3000"/>
631+
<copyField source="geographicDistribution" dest="_text_" maxChars="3000"/>
632+
<copyField source="geographicDistributionLink" dest="_text_" maxChars="3000"/>
633+
<copyField source="geographicDistributionLinkLabel" dest="_text_" maxChars="3000"/>
634+
<copyField source="geographicNumberOfDimensions" dest="_text_" maxChars="3000"/>
635+
<copyField source="geographicProcessStep" dest="_text_" maxChars="3000"/>
636+
<copyField source="geographicProtocol" dest="_text_" maxChars="3000"/>
637+
<copyField source="geographicReferenceDate" dest="_text_" maxChars="3000"/>
638+
<copyField source="geographicReferenceDateType" dest="_text_" maxChars="3000"/>
639+
<copyField source="geographicReferenceDateValue" dest="_text_" maxChars="3000"/>
640+
<copyField source="geographicReferenceSystemCode" dest="_text_" maxChars="3000"/>
641+
<copyField source="geographicReferenceSystemCodeSpace" dest="_text_" maxChars="3000"/>
642+
<copyField source="geographicReferenceSystemInfo" dest="_text_" maxChars="3000"/>
643+
<copyField source="geographicResolution" dest="_text_" maxChars="3000"/>
644+
<copyField source="geographicResolutionUnitOfMeasure" dest="_text_" maxChars="3000"/>
645+
<copyField source="geographicResourceType" dest="_text_" maxChars="3000"/>
646+
<copyField source="geographicSpatialRepresentationType" dest="_text_" maxChars="3000"/>
647+
<copyField source="geographicSpatialResolution" dest="_text_" maxChars="3000"/> <copyField source="geographicSpatialResolutionType" dest="_text_" maxChars="3000"/>
648+
<copyField source="geographicSpatialResolutionUnitOfMeasure" dest="_text_" maxChars="3000"/> <copyField source="geographicSpatialResolutionValue" dest="_text_" maxChars="3000"/>
601649
<copyField source="geographicUnit" dest="_text_" maxChars="3000"/>
650+
<copyField source="geometricObjectCount" dest="_text_" maxChars="3000"/>
651+
<copyField source="geometricObjectType" dest="_text_" maxChars="3000"/>
602652
<copyField source="grantNumber" dest="_text_" maxChars="3000"/>
603653
<copyField source="grantNumberAgency" dest="_text_" maxChars="3000"/>
604654
<copyField source="grantNumberValue" dest="_text_" maxChars="3000"/>

‎doc/release-notes/10156-fast-redeploy-scripts.md‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎doc/release-notes/11447-mydata-retrieve-empty-result-set.md‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎doc/release-notes/11588-search-api-doesnt-return-image-url.md‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎doc/release-notes/11733-api-get-file-citation-format.md‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎doc/release-notes/11912-edit-template-apis‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎doc/release-notes/11920-more-ra-info.md‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎doc/release-notes/12014-croissant-1.1.md‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎doc/release-notes/12070-datacite-getmetadata.md‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎doc/release-notes/12112-get-default-contributor-role.md‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)