From 947cfcd8cf63d3f01b7743ce197afa7b18d75ffc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Mon, 14 Mar 2022 15:07:24 +0100 Subject: [PATCH] ref #9932 adapt article detail/pages handling for MexicoEflora import --- .../cdm/io/mexico/MexicoEfloraCommonNameRefImport.java | 3 ++- .../io/mexico/MexicoEfloraDistributionRefImport.java | 4 ++-- .../cdm/io/mexico/MexicoEfloraFactImport.java | 3 ++- .../cdm/io/mexico/MexicoEfloraImportState.java | 8 ++++---- .../cdm/io/mexico/MexicoEfloraRefArticlesImport.java | 10 ++++------ .../cdm/io/mexico/MexicoEfloraRefOtherBooksImport.java | 2 +- .../cdm/io/mexico/MexicoEfloraRefSerialsImport.java | 2 +- .../cdm/io/mexico/MexicoEfloraRefWebSitesImport.java | 2 +- .../cdm/io/mexico/MexicoEfloraReferenceImportBase.java | 4 ++-- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraCommonNameRefImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraCommonNameRefImport.java index 4b9d640d..1d12f046 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraCommonNameRefImport.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraCommonNameRefImport.java @@ -92,7 +92,8 @@ public class MexicoEfloraCommonNameRefImport extends MexicoEfloraImportBase { CommonTaxonName commonName = commonNameMap.get(idCombi); Reference ref = referenceMap.get(String.valueOf(idBibliografia)); - String detail = state.getRefDetailMap().get(idBibliografia); +// String detail = state.getRefDetailMap().get(idBibliografia); + String detail = null; if (commonName != null) { DescriptionElementSource source = commonName.addPrimaryTaxonomicSource(ref, detail); diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraDistributionRefImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraDistributionRefImport.java index 00d4fe7c..026077c2 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraDistributionRefImport.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraDistributionRefImport.java @@ -93,8 +93,8 @@ public class MexicoEfloraDistributionRefImport extends MexicoEfloraImportBase { continue; } Reference ref = referenceMap.get(String.valueOf(idBibliografia)); - String detail = state.getRefDetailMap().get(idBibliografia); - +// String detail = state.getRefDetailMap().get(idBibliografia); + String detail = null; DescriptionElementSource source = distribution.addPrimaryTaxonomicSource(ref, detail); //TODO nameUsedInSource for distribution diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraFactImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraFactImport.java index 740468f9..e22b9765 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraFactImport.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraFactImport.java @@ -161,7 +161,8 @@ public class MexicoEfloraFactImport extends MexicoEfloraImportBase { CategoricalData categoricalData, int idBibliografia, int id) { Reference ref = referenceMap == null ? null : referenceMap.get(String.valueOf(idBibliografia)); - String detail = state.getRefDetailMap().get(idBibliografia); +// String detail = state.getRefDetailMap().get(idBibliografia); + String detail = null; if (ref != null) { if (categoricalData != null) { diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraImportState.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraImportState.java index 841e51f7..84de6449 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraImportState.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraImportState.java @@ -42,7 +42,7 @@ public class MexicoEfloraImportState private Map areaLabelMap = new HashMap<>(); private Map referenceUuidMap = new HashMap<>(); - private Map refDetailMap = new HashMap<>(); +// private Map refDetailMap = new HashMap<>(); private Map commonNameMap = new HashMap<>(); private Map distributionMap = new HashMap<>(); @@ -82,9 +82,9 @@ public class MexicoEfloraImportState public Map getReferenceUuidMap() { return referenceUuidMap; } - public Map getRefDetailMap() { - return refDetailMap; - } +// public Map getRefDetailMap() { +// return refDetailMap; +// } public Map getCommonNameMap() { return commonNameMap; diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraRefArticlesImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraRefArticlesImport.java index 44c3cad0..0a4251ae 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraRefArticlesImport.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraRefArticlesImport.java @@ -103,16 +103,14 @@ public class MexicoEfloraRefArticlesImport extends MexicoEfloraReferenceImportBa } //concat - String detail = null; if (isNotBlank(concat)) { - //TODO split String[] split = concat.split(":"); String volume = split[0]; + ref.setVolume(volume); if (split.length > 1) { - //TODO correct handling of detail - detail = split[1]; + String pages = split[1]; + ref.setPages(pages); } - ref.setVolume(volume); }else { logger.info(refId + ": No volume"); } @@ -134,7 +132,7 @@ public class MexicoEfloraRefArticlesImport extends MexicoEfloraReferenceImportBa } //register id and make import source - handleId(state, refId, ref, detail); + handleId(state, refId, ref); partitioner.startDoSave(); refsToSave.add(ref); diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraRefOtherBooksImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraRefOtherBooksImport.java index dc475512..06114d4f 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraRefOtherBooksImport.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraRefOtherBooksImport.java @@ -113,7 +113,7 @@ public class MexicoEfloraRefOtherBooksImport extends MexicoEfloraReferenceImport } //register id and make import source - handleId(state, refId, ref, null); + handleId(state, refId, ref); partitioner.startDoSave(); refsToSave.add(ref); diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraRefSerialsImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraRefSerialsImport.java index 4d354da3..70aedb10 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraRefSerialsImport.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraRefSerialsImport.java @@ -114,7 +114,7 @@ public class MexicoEfloraRefSerialsImport extends MexicoEfloraReferenceImportBas } //register id and make import source - handleId(state, refId, ref, null); + handleId(state, refId, ref); partitioner.startDoSave(); refsToSave.add(ref); diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraRefWebSitesImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraRefWebSitesImport.java index 9a7fe764..a7a2caf9 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraRefWebSitesImport.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraRefWebSitesImport.java @@ -108,7 +108,7 @@ public class MexicoEfloraRefWebSitesImport extends MexicoEfloraReferenceImportBa } //register id and make import source - handleId(state, refId, ref, null); + handleId(state, refId, ref); partitioner.startDoSave(); refsToSave.add(ref); diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraReferenceImportBase.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraReferenceImportBase.java index 594064b7..26a47c04 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraReferenceImportBase.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoEfloraReferenceImportBase.java @@ -129,9 +129,9 @@ public abstract class MexicoEfloraReferenceImportBase extends MexicoEfloraImpor } } - protected void handleId(MexicoEfloraImportState state, int refId, Reference ref, String detail) { + protected void handleId(MexicoEfloraImportState state, int refId, Reference ref) { state.getReferenceUuidMap().put(refId, ref.getUuid()); - state.getRefDetailMap().put(refId, detail); +// state.getRefDetailMap().put(refId, detail); //TODO not needed anymore once "related objects" are adapted everywhere Reference sourceRef = getSourceReference(state.getConfig().getSourceReference()); -- 2.34.1