Skip to content

Commit 27b60a9

Browse files
veravera
committed
Merge remote-tracking branch 'origin/10887-solr-types' into feat/solr-field-types
2 parents 37fdcae + e011e53 commit 27b60a9

File tree

2 files changed

+67
-41
lines changed

2 files changed

+67
-41
lines changed

‎conf/solr/schema.xml

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -272,46 +272,46 @@
272272
<field name="contributorType" type="text_en" multiValued="true" stored="true" indexed="true"/>
273273
<field name="controlOperations" type="text_en" multiValued="false" stored="true" indexed="true"/>
274274
<field name="country" type="text_en" multiValued="true" stored="true" indexed="true"/>
275-
<field name="coverage.Depth" type="text_en" multiValued="false" stored="true" indexed="true"/>
276-
<field name="coverage.ObjectCount" type="text_en" multiValued="false" stored="true" indexed="true"/>
277-
<field name="coverage.ObjectDensity" type="text_en" multiValued="false" stored="true" indexed="true"/>
275+
<field name="coverage.Depth" type="pdouble" multiValued="false" stored="true" indexed="true"/>
276+
<field name="coverage.ObjectCount" type="plong" multiValued="false" stored="true" indexed="true"/>
277+
<field name="coverage.ObjectDensity" type="pdouble" multiValued="false" stored="true" indexed="true"/>
278278
<field name="coverage.Polarization" type="text_en" multiValued="false" stored="true" indexed="true"/>
279-
<field name="coverage.Redshift.MaximumValue" type="text_en" multiValued="true" stored="true" indexed="true"/>
280-
<field name="coverage.Redshift.MinimumValue" type="text_en" multiValued="true" stored="true" indexed="true"/>
281-
<field name="coverage.RedshiftValue" type="text_en" multiValued="true" stored="true" indexed="true"/>
282-
<field name="coverage.SkyFraction" type="text_en" multiValued="false" stored="true" indexed="true"/>
279+
<field name="coverage.Redshift.MaximumValue" type="pdouble" multiValued="true" stored="true" indexed="true"/>
280+
<field name="coverage.Redshift.MinimumValue" type="pdouble" multiValued="true" stored="true" indexed="true"/>
281+
<field name="coverage.RedshiftValue" type="pdouble" multiValued="true" stored="true" indexed="true"/>
282+
<field name="coverage.SkyFraction" type="pdouble" multiValued="false" stored="true" indexed="true"/>
283283
<field name="coverage.Spatial" type="text_en" multiValued="true" stored="true" indexed="true"/>
284284
<field name="coverage.Spectral.Bandpass" type="text_en" multiValued="true" stored="true" indexed="true"/>
285-
<field name="coverage.Spectral.CentralWavelength" type="text_en" multiValued="true" stored="true" indexed="true"/>
286-
<field name="coverage.Spectral.MaximumWavelength" type="text_en" multiValued="true" stored="true" indexed="true"/>
287-
<field name="coverage.Spectral.MinimumWavelength" type="text_en" multiValued="true" stored="true" indexed="true"/>
285+
<field name="coverage.Spectral.CentralWavelength" type="pdouble" multiValued="true" stored="true" indexed="true"/>
286+
<field name="coverage.Spectral.MaximumWavelength" type="pdouble" multiValued="true" stored="true" indexed="true"/>
287+
<field name="coverage.Spectral.MinimumWavelength" type="pdouble" multiValued="true" stored="true" indexed="true"/>
288288
<field name="coverage.Spectral.Wavelength" type="text_en" multiValued="true" stored="true" indexed="true"/>
289289
<field name="coverage.Temporal" type="text_en" multiValued="true" stored="true" indexed="true"/>
290-
<field name="coverage.Temporal.StartTime" type="text_en" multiValued="true" stored="true" indexed="true"/>
291-
<field name="coverage.Temporal.StopTime" type="text_en" multiValued="true" stored="true" indexed="true"/>
290+
<field name="coverage.Temporal.StartTime" type="date_range" multiValued="true" stored="true" indexed="true"/>
291+
<field name="coverage.Temporal.StopTime" type="date_range" multiValued="true" stored="true" indexed="true"/>
292292
<field name="dataCollectionSituation" type="text_en" multiValued="false" stored="true" indexed="true"/>
293293
<field name="dataCollector" type="text_en" multiValued="false" stored="true" indexed="true"/>
294-
<field name="dataSources" type="text_en" multiValued="true" stored="true" indexed="true"/>
295294
<field name="datasetContact" type="text_en" multiValued="true" stored="true" indexed="true"/>
296295
<field name="datasetContactAffiliation" type="text_en" multiValued="true" stored="true" indexed="true"/>
297296
<field name="datasetContactEmail" type="text_en" multiValued="true" stored="true" indexed="true"/>
298297
<field name="datasetContactName" type="text_en" multiValued="true" stored="true" indexed="true"/>
299298
<field name="datasetLevelErrorNotes" type="text_en" multiValued="false" stored="true" indexed="true"/>
299+
<field name="dataSources" type="text_en" multiValued="true" stored="true" indexed="true"/>
300300
<field name="dateOfCollection" type="text_en" multiValued="true" stored="true" indexed="true"/>
301-
<field name="dateOfCollectionEnd" type="text_en" multiValued="true" stored="true" indexed="true"/>
302-
<field name="dateOfCollectionStart" type="text_en" multiValued="true" stored="true" indexed="true"/>
303-
<field name="dateOfDeposit" type="text_en" multiValued="false" stored="true" indexed="true"/>
301+
<field name="dateOfCollectionEnd" type="date_range" multiValued="true" stored="true" indexed="true"/>
302+
<field name="dateOfCollectionStart" type="date_range" multiValued="true" stored="true" indexed="true"/>
303+
<field name="dateOfDeposit" type="date_range" multiValued="false" stored="true" indexed="true"/>
304304
<field name="depositor" type="text_en" multiValued="false" stored="true" indexed="true"/>
305305
<field name="deviationsFromSampleDesign" type="text_en" multiValued="false" stored="true" indexed="true"/>
306-
<field name="distributionDate" type="text_en" multiValued="false" stored="true" indexed="true"/>
306+
<field name="distributionDate" type="date_range" multiValued="false" stored="true" indexed="true"/>
307307
<field name="distributor" type="text_en" multiValued="true" stored="true" indexed="true"/>
308308
<field name="distributorAbbreviation" type="text_en" multiValued="true" stored="true" indexed="true"/>
309309
<field name="distributorAffiliation" type="text_en" multiValued="true" stored="true" indexed="true"/>
310310
<field name="distributorLogoURL" type="text_en" multiValued="true" stored="true" indexed="true"/>
311311
<field name="distributorName" type="text_en" multiValued="true" stored="true" indexed="true"/>
312312
<field name="distributorURL" type="text_en" multiValued="true" stored="true" indexed="true"/>
313313
<field name="dsDescription" type="text_en" multiValued="true" stored="true" indexed="true"/>
314-
<field name="dsDescriptionDate" type="text_en" multiValued="true" stored="true" indexed="true"/>
314+
<field name="dsDescriptionDate" type="date_range" multiValued="true" stored="true" indexed="true"/>
315315
<field name="dsDescriptionValue" type="text_en" multiValued="true" stored="true" indexed="true"/>
316316
<field name="eastLongitude" type="text_en" multiValued="true" stored="true" indexed="true"/>
317317
<field name="frequencyOfDataCollection" type="text_en" multiValued="false" stored="true" indexed="true"/>
@@ -323,12 +323,12 @@
323323
<field name="grantNumberValue" type="text_en" multiValued="true" stored="true" indexed="true"/>
324324
<field name="journalArticleType" type="text_en" multiValued="true" stored="true" indexed="true"/>
325325
<field name="journalIssue" type="text_en" multiValued="true" stored="true" indexed="true"/>
326-
<field name="journalPubDate" type="text_en" multiValued="true" stored="true" indexed="true"/>
326+
<field name="journalPubDate" type="date_range" multiValued="true" stored="true" indexed="true"/>
327327
<field name="journalVolume" type="text_en" multiValued="true" stored="true" indexed="true"/>
328328
<field name="journalVolumeIssue" type="text_en" multiValued="true" stored="true" indexed="true"/>
329329
<field name="keyword" type="text_en" multiValued="true" stored="true" indexed="true"/>
330-
<field name="keywordValue" type="text_en" multiValued="true" stored="true" indexed="true"/>
331330
<field name="keywordTermURI" type="text_en" multiValued="true" stored="true" indexed="true"/>
331+
<field name="keywordValue" type="text_en" multiValued="true" stored="true" indexed="true"/>
332332
<field name="keywordVocabulary" type="text_en" multiValued="true" stored="true" indexed="true"/>
333333
<field name="keywordVocabularyURI" type="text_en" multiValued="true" stored="true" indexed="true"/>
334334
<field name="kindOfData" type="text_en" multiValued="true" stored="true" indexed="true"/>
@@ -348,19 +348,19 @@
348348
<field name="producerLogoURL" type="text_en" multiValued="true" stored="true" indexed="true"/>
349349
<field name="producerName" type="text_en" multiValued="true" stored="true" indexed="true"/>
350350
<field name="producerURL" type="text_en" multiValued="true" stored="true" indexed="true"/>
351-
<field name="productionDate" type="text_en" multiValued="false" stored="true" indexed="true"/>
351+
<field name="productionDate" type="date_range" multiValued="false" stored="true" indexed="true"/>
352352
<field name="productionPlace" type="text_en" multiValued="true" stored="true" indexed="true"/>
353353
<field name="publication" type="text_en" multiValued="true" stored="true" indexed="true"/>
354354
<field name="publicationCitation" type="text_en" multiValued="true" stored="true" indexed="true"/>
355-
<field name="publicationRelationType" type="text_en" multiValued="true" stored="true" indexed="true"/>
356355
<field name="publicationIDNumber" type="text_en" multiValued="true" stored="true" indexed="true"/>
357356
<field name="publicationIDType" type="text_en" multiValued="true" stored="true" indexed="true"/>
357+
<field name="publicationRelationType" type="text_en" multiValued="true" stored="true" indexed="true"/>
358358
<field name="publicationURL" type="text_en" multiValued="true" stored="true" indexed="true"/>
359359
<field name="redshiftType" type="text_en" multiValued="false" stored="true" indexed="true"/>
360360
<field name="relatedDatasets" type="text_en" multiValued="true" stored="true" indexed="true"/>
361361
<field name="relatedMaterial" type="text_en" multiValued="true" stored="true" indexed="true"/>
362362
<field name="researchInstrument" type="text_en" multiValued="false" stored="true" indexed="true"/>
363-
<field name="resolution.Redshift" type="text_en" multiValued="false" stored="true" indexed="true"/>
363+
<field name="resolution.Redshift" type="pdouble" multiValued="false" stored="true" indexed="true"/>
364364
<field name="resolution.Spatial" type="text_en" multiValued="false" stored="true" indexed="true"/>
365365
<field name="resolution.Spectral" type="text_en" multiValued="false" stored="true" indexed="true"/>
366366
<field name="resolution.Temporal" type="text_en" multiValued="false" stored="true" indexed="true"/>
@@ -384,28 +384,28 @@
384384
<field name="studyAssayOrganism" type="text_en" multiValued="true" stored="true" indexed="true"/>
385385
<field name="studyAssayOtherMeasurmentType" type="text_en" multiValued="true" stored="true" indexed="true"/>
386386
<field name="studyAssayOtherOrganism" type="text_en" multiValued="true" stored="true" indexed="true"/>
387-
<field name="studyAssayPlatform" type="text_en" multiValued="true" stored="true" indexed="true"/>
388387
<field name="studyAssayOtherPlatform" type="text_en" multiValued="true" stored="true" indexed="true"/>
389-
<field name="studyAssayTechnologyType" type="text_en" multiValued="true" stored="true" indexed="true"/>
390388
<field name="studyAssayOtherTechnologyType" type="text_en" multiValued="true" stored="true" indexed="true"/>
389+
<field name="studyAssayPlatform" type="text_en" multiValued="true" stored="true" indexed="true"/>
390+
<field name="studyAssayTechnologyType" type="text_en" multiValued="true" stored="true" indexed="true"/>
391391
<field name="studyDesignType" type="text_en" multiValued="true" stored="true" indexed="true"/>
392-
<field name="studyOtherDesignType" type="text_en" multiValued="true" stored="true" indexed="true"/>
393392
<field name="studyFactorType" type="text_en" multiValued="true" stored="true" indexed="true"/>
393+
<field name="studyOtherDesignType" type="text_en" multiValued="true" stored="true" indexed="true"/>
394394
<field name="studyOtherFactorType" type="text_en" multiValued="true" stored="true" indexed="true"/>
395395
<field name="subject" type="text_en" multiValued="true" stored="true" indexed="true"/>
396396
<field name="subtitle" type="text_en" multiValued="false" stored="true" indexed="true"/>
397-
<field name="targetSampleActualSize" type="text_en" multiValued="false" stored="true" indexed="true"/>
397+
<field name="targetSampleActualSize" type="plong" multiValued="false" stored="true" indexed="true"/>
398398
<field name="targetSampleSize" type="text_en" multiValued="false" stored="true" indexed="true"/>
399399
<field name="targetSampleSizeFormula" type="text_en" multiValued="false" stored="true" indexed="true"/>
400400
<field name="timeMethod" type="text_en" multiValued="false" stored="true" indexed="true"/>
401401
<field name="timePeriodCovered" type="text_en" multiValued="true" stored="true" indexed="true"/>
402-
<field name="timePeriodCoveredEnd" type="text_en" multiValued="true" stored="true" indexed="true"/>
403-
<field name="timePeriodCoveredStart" type="text_en" multiValued="true" stored="true" indexed="true"/>
402+
<field name="timePeriodCoveredEnd" type="date_range" multiValued="true" stored="true" indexed="true"/>
403+
<field name="timePeriodCoveredStart" type="date_range" multiValued="true" stored="true" indexed="true"/>
404404
<field name="title" type="text_en" multiValued="false" stored="true" indexed="true"/>
405+
<field name="topicClassification" type="text_en" multiValued="true" stored="true" indexed="true"/>
405406
<field name="topicClassValue" type="text_en" multiValued="true" stored="true" indexed="true"/>
406407
<field name="topicClassVocab" type="text_en" multiValued="true" stored="true" indexed="true"/>
407408
<field name="topicClassVocabURI" type="text_en" multiValued="true" stored="true" indexed="true"/>
408-
<field name="topicClassification" type="text_en" multiValued="true" stored="true" indexed="true"/>
409409
<field name="unitOfAnalysis" type="text_en" multiValued="true" stored="true" indexed="true"/>
410410
<field name="universe" type="text_en" multiValued="true" stored="true" indexed="true"/>
411411
<field name="weighting" type="text_en" multiValued="false" stored="true" indexed="true"/>
@@ -533,12 +533,12 @@
533533
<copyField source="coverage.Temporal.StopTime" dest="_text_" maxChars="3000"/>
534534
<copyField source="dataCollectionSituation" dest="_text_" maxChars="3000"/>
535535
<copyField source="dataCollector" dest="_text_" maxChars="3000"/>
536-
<copyField source="dataSources" dest="_text_" maxChars="3000"/>
537536
<copyField source="datasetContact" dest="_text_" maxChars="3000"/>
538537
<copyField source="datasetContactAffiliation" dest="_text_" maxChars="3000"/>
539538
<copyField source="datasetContactEmail" dest="_text_" maxChars="3000"/>
540539
<copyField source="datasetContactName" dest="_text_" maxChars="3000"/>
541540
<copyField source="datasetLevelErrorNotes" dest="_text_" maxChars="3000"/>
541+
<copyField source="dataSources" dest="_text_" maxChars="3000"/>
542542
<copyField source="dateOfCollection" dest="_text_" maxChars="3000"/>
543543
<copyField source="dateOfCollectionEnd" dest="_text_" maxChars="3000"/>
544544
<copyField source="dateOfCollectionStart" dest="_text_" maxChars="3000"/>
@@ -569,8 +569,8 @@
569569
<copyField source="journalVolume" dest="_text_" maxChars="3000"/>
570570
<copyField source="journalVolumeIssue" dest="_text_" maxChars="3000"/>
571571
<copyField source="keyword" dest="_text_" maxChars="3000"/>
572-
<copyField source="keywordValue" dest="_text_" maxChars="3000"/>
573572
<copyField source="keywordTermURI" dest="_text_" maxChars="3000"/>
573+
<copyField source="keywordValue" dest="_text_" maxChars="3000"/>
574574
<copyField source="keywordVocabulary" dest="_text_" maxChars="3000"/>
575575
<copyField source="keywordVocabularyURI" dest="_text_" maxChars="3000"/>
576576
<copyField source="kindOfData" dest="_text_" maxChars="3000"/>
@@ -594,9 +594,9 @@
594594
<copyField source="productionPlace" dest="_text_" maxChars="3000"/>
595595
<copyField source="publication" dest="_text_" maxChars="3000"/>
596596
<copyField source="publicationCitation" dest="_text_" maxChars="3000"/>
597-
<copyField source="publicationRelationType" dest="_text_" maxChars="3000"/>
598597
<copyField source="publicationIDNumber" dest="_text_" maxChars="3000"/>
599598
<copyField source="publicationIDType" dest="_text_" maxChars="3000"/>
599+
<copyField source="publicationRelationType" dest="_text_" maxChars="3000"/>
600600
<copyField source="publicationURL" dest="_text_" maxChars="3000"/>
601601
<copyField source="redshiftType" dest="_text_" maxChars="3000"/>
602602
<copyField source="relatedDatasets" dest="_text_" maxChars="3000"/>
@@ -626,13 +626,13 @@
626626
<copyField source="studyAssayOrganism" dest="_text_" maxChars="3000"/>
627627
<copyField source="studyAssayOtherMeasurmentType" dest="_text_" maxChars="3000"/>
628628
<copyField source="studyAssayOtherOrganism" dest="_text_" maxChars="3000"/>
629-
<copyField source="studyAssayPlatform" dest="_text_" maxChars="3000"/>
630629
<copyField source="studyAssayOtherPlatform" dest="_text_" maxChars="3000"/>
631-
<copyField source="studyAssayTechnologyType" dest="_text_" maxChars="3000"/>
632630
<copyField source="studyAssayOtherTechnologyType" dest="_text_" maxChars="3000"/>
631+
<copyField source="studyAssayPlatform" dest="_text_" maxChars="3000"/>
632+
<copyField source="studyAssayTechnologyType" dest="_text_" maxChars="3000"/>
633633
<copyField source="studyDesignType" dest="_text_" maxChars="3000"/>
634-
<copyField source="studyOtherDesignType" dest="_text_" maxChars="3000"/>
635634
<copyField source="studyFactorType" dest="_text_" maxChars="3000"/>
635+
<copyField source="studyOtherDesignType" dest="_text_" maxChars="3000"/>
636636
<copyField source="studyOtherFactorType" dest="_text_" maxChars="3000"/>
637637
<copyField source="subject" dest="_text_" maxChars="3000"/>
638638
<copyField source="subtitle" dest="_text_" maxChars="3000"/>
@@ -644,10 +644,10 @@
644644
<copyField source="timePeriodCoveredEnd" dest="_text_" maxChars="3000"/>
645645
<copyField source="timePeriodCoveredStart" dest="_text_" maxChars="3000"/>
646646
<copyField source="title" dest="_text_" maxChars="3000"/>
647+
<copyField source="topicClassification" dest="_text_" maxChars="3000"/>
647648
<copyField source="topicClassValue" dest="_text_" maxChars="3000"/>
648649
<copyField source="topicClassVocab" dest="_text_" maxChars="3000"/>
649650
<copyField source="topicClassVocabURI" dest="_text_" maxChars="3000"/>
650-
<copyField source="topicClassification" dest="_text_" maxChars="3000"/>
651651
<copyField source="unitOfAnalysis" dest="_text_" maxChars="3000"/>
652652
<copyField source="universe" dest="_text_" maxChars="3000"/>
653653
<copyField source="weighting" dest="_text_" maxChars="3000"/>
@@ -816,7 +816,7 @@
816816
<fieldType name="pdates" class="solr.DatePointField" docValues="true" multiValued="true"/>
817817

818818
<fieldType name="date_range" class="solr.DateRangeField"/>
819-
819+
820820
<!--Binary data type. The data should be sent/retrieved in as Base64 encoded Strings -->
821821
<fieldType name="binary" class="solr.BinaryField"/>
822822

0 commit comments

Comments
 (0)