From b436f19a520000aa37e2efae6f25ca125c33090c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Wed, 16 May 2018 14:13:38 +0200 Subject: [PATCH] ref #7334, ref #6627 Adapted CDM light to support pp synonyms (cont.) --- .../cdmLight/CdmLightClassificationExport.java | 16 ++++++++-------- .../cdm/io/cdmLight/CdmLightExportTable.java | 3 +++ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/cdmLight/CdmLightClassificationExport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/cdmLight/CdmLightClassificationExport.java index a00759f14c..947655b6a2 100755 --- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/cdmLight/CdmLightClassificationExport.java +++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/cdmLight/CdmLightClassificationExport.java @@ -747,16 +747,16 @@ public class CdmLightClassificationExport //As we currently do have only 1 reference column in CDM light the synonym relationship //reference is used here. This is according to how pro parte synonyms were mapped to //concept relationships in #7334 - Reference secRef = rel.getCitation(); - csvLine[table.getIndex(CdmLightExportTable.SEC_REFERENCE_FK)] = getId(state, secRef); - csvLine[table.getIndex(CdmLightExportTable.SEC_REFERENCE)] = getTitleCache(secRef); - -// Reference secRef = ppSyonym.getSec(); +// Reference secRef = rel.getCitation(); // csvLine[table.getIndex(CdmLightExportTable.SEC_REFERENCE_FK)] = getId(state, secRef); // csvLine[table.getIndex(CdmLightExportTable.SEC_REFERENCE)] = getTitleCache(secRef); -// Reference synSecRef = rel.getCitation(); -// csvLine[table.getIndex(CdmLightExportTable.SYN_SEC_REFERENCE_FK)] = getId(state, secRef); -// csvLine[table.getIndex(CdmLightExportTable.SYN_SEC_REFERENCE)] = getTitleCache(secRef); + + Reference secRef = ppSyonym.getSec(); + csvLine[table.getIndex(CdmLightExportTable.SEC_REFERENCE_FK)] = getId(state, secRef); + csvLine[table.getIndex(CdmLightExportTable.SEC_REFERENCE)] = getTitleCache(secRef); + Reference synSecRef = rel.getCitation(); + csvLine[table.getIndex(CdmLightExportTable.SYN_SEC_REFERENCE_FK)] = getId(state, secRef); + csvLine[table.getIndex(CdmLightExportTable.SYN_SEC_REFERENCE)] = getTitleCache(secRef); //pro parte type TaxonRelationshipType type = rel.getType(); diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/cdmLight/CdmLightExportTable.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/cdmLight/CdmLightExportTable.java index 0d94ac65e9..5bbc88bc04 100644 --- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/cdmLight/CdmLightExportTable.java +++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/cdmLight/CdmLightExportTable.java @@ -45,6 +45,9 @@ public enum CdmLightExportTable { protected static final String PARENT_FK = "Parent_FK"; protected static final String SEC_REFERENCE_FK = "SecReference_FK"; protected static final String SEC_REFERENCE = "SecReference"; + protected static final String SYN_SEC_REFERENCE_FK = "SynSecReference_FK"; + protected static final String SYN_SEC_REFERENCE = "SynSecReference"; + protected static final String IS_PRO_PARTE = "IsProParteSynonym"; protected static final String IS_PARTIAL = "IsPartial"; protected static final String IS_MISAPPLIED = "IsMisapplied"; -- 2.34.1