From 9709bef229f0dabd362cbffbda9209599a994947 Mon Sep 17 00:00:00 2001 From: ahakanzn Date: Mon, 3 Jun 2024 11:38:50 +0200 Subject: [PATCH] masterSourceType and displayOnNHCPortal columns added to grscicoll/export (https://github.com/gbif/registry/issues/580) --- .../gbif/registry/ws/export/CsvWriter.java | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/registry-ws/src/main/java/org/gbif/registry/ws/export/CsvWriter.java b/registry-ws/src/main/java/org/gbif/registry/ws/export/CsvWriter.java index eb314b6d6..00f174ead 100644 --- a/registry-ws/src/main/java/org/gbif/registry/ws/export/CsvWriter.java +++ b/registry-ws/src/main/java/org/gbif/registry/ws/export/CsvWriter.java @@ -29,6 +29,8 @@ import org.gbif.api.vocabulary.DatasetSubtype; import org.gbif.api.vocabulary.DatasetType; import org.gbif.api.vocabulary.License; +import org.gbif.api.vocabulary.collections.MasterSourceType; + import org.supercsv.cellprocessor.*; import org.supercsv.cellprocessor.ift.CellProcessor; import org.supercsv.io.CsvBeanWriter; @@ -271,7 +273,9 @@ public static CsvWriter collections( "collection.replacedBy", "collection.featuredImageUrl", "collection.featuredImageLicense", - "collection.temporalCoverage" + "collection.temporalCoverage", + "collection.masterSource", + "collection.displayOnNHCPortal" }) .header( new String[] { @@ -320,7 +324,9 @@ public static CsvWriter collections( "replaced_by", "featuredImageUrl", "featuredImageLicense", - "temporalCoverage" + "temporalCoverage", + "masterSourceType", + "displayOnNHCPortal" }) .processors( new CellProcessor[] { @@ -369,7 +375,9 @@ public static CsvWriter collections( new UUIDProcessor(), // replacedBy: UUID new UriProcessor(), // featuredImageUrl : URI new Optional(new ParseEnum(License.class)), // featuredImageLicense: License - new CleanStringProcessor() // temporalCoverage: String + new CleanStringProcessor(), // temporalCoverage: String + new Optional(new ParseEnum(MasterSourceType.class)), // masterSourceType: MasterSource + new Optional(new FmtBool("true", "false")) //displayOnNHCPortal: boolean }) .forClass(CollectionView.class) .preference(preference) @@ -423,7 +431,9 @@ public static CsvWriter institutions( "replacedBy", "convertedToCollection", "featuredImageUrl", - "featuredImageLicense" + "featuredImageLicense", + "masterSource", + "displayOnNHCPortal" }) .header( new String[] { @@ -466,7 +476,9 @@ public static CsvWriter institutions( "replaced_by", "converted_to_collection", "featuredImageUrl", - "featuredImageLicense" + "featuredImageLicense", + "masterSourceType", + "displayOnNHCPortal" }) .processors( new CellProcessor[] { @@ -511,6 +523,8 @@ public static CsvWriter institutions( new UUIDProcessor(), // convertedToCollection: UUID new UriProcessor(), // featuredImageUrl : URI new Optional(new ParseEnum(License.class)), // featuredImageLicense: License + new Optional(new ParseEnum(MasterSourceType.class)), // masterSourceType: MasterSource + new Optional(new FmtBool("true", "false")) //displayOnNHCPortal: boolean }) .preference(preference) .pager(pager)