change doSpecimen to doEcoFacts

[cdmlib-apps.git] / app-import / src / main / java / eu / etaxonomy / cdm / io / algaterra / AlgaTerraSpecimenImport.java

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/algaterra/AlgaTerraSpecimenImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/algaterra/AlgaTerraSpecimenImport.java
index b0bee1125bb289c438049b062fa4b8e24416589d..94d45c84770820846666612f313a58e57ef8d195 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/algaterra/AlgaTerraSpecimenImport.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/algaterra/AlgaTerraSpecimenImport.java
@@ -98,9 +98,9 @@ public class AlgaTerraSpecimenImport  extends AlgaTerraSpecimenImportBase {
        @Override\r
        protected String getRecordQuery(BerlinModelImportConfigurator config) {\r
                        String strQuery =   \r
-            " SELECT PTaxon.RIdentifier as taxonId, Fact.FactId, Fact.RecordBasis, EcoFact.*, " + \r
+            " SELECT PTaxon.RIdentifier as taxonId, Fact.FactId, Fact.RecordBasis, EcoFact.*, EcoFact.EcoFactId as unitId, " + \r
                " tg.ID AS GazetteerId, tg.L2Code, tg.L3Code, tg.L4Code, tg.Country, tg.ISOCountry, " +\r
-               " ec.UUID as climateUuid, eh.UUID as habitatUuid, elf.UUID as lifeFormUuid" +\r
+               " ec.UUID as climateUuid, eh.UUID as habitatUuid, elf.UUID as lifeFormUuid " +\r
             " FROM Fact " + \r
                  " INNER JOIN EcoFact ON Fact.ExtensionFk = EcoFact.EcoFactId " +\r
                  " INNER JOIN PTaxon ON dbo.Fact.PTNameFk = dbo.PTaxon.PTNameFk AND dbo.Fact.PTRefFk = dbo.PTaxon.PTRefFk " +\r
@@ -130,7 +130,7 @@ public class AlgaTerraSpecimenImport  extends AlgaTerraSpecimenImportBase {
                Set<TaxonBase> taxaToSave = new HashSet<TaxonBase>();\r
                \r
                Map<String, TaxonBase> taxonMap = (Map<String, TaxonBase>) partitioner.getObjectMap(BerlinModelTaxonImport.NAMESPACE);\r
-               Map<String, DerivedUnit> ecoFactMap = (Map<String, DerivedUnit>) partitioner.getObjectMap(ECO_FACT_NAMESPACE);\r
+               Map<String, DerivedUnit> ecoFactDerivedUnitMap = (Map<String, DerivedUnit>) partitioner.getObjectMap(ECO_FACT_DERIVED_UNIT_NAMESPACE);\r
                \r
                ResultSet rs = partitioner.getResultSet();\r
 \r
@@ -155,7 +155,7 @@ public class AlgaTerraSpecimenImport  extends AlgaTerraSpecimenImportBase {
                                \r
                                        //facade\r
                                        DerivedUnitType type = makeDerivedUnitType(recordBasis);\r
-                                       DerivedUnitFacade facade = getDerivedUnit(state, ecoFactId, ecoFactMap, type);\r
+                                       DerivedUnitFacade facade = getDerivedUnit(state, ecoFactId, ecoFactDerivedUnitMap, type);\r
                                        \r
                                        //field observation\r
                                        handleSingleSpecimen(rs, facade, state, partitioner);\r
@@ -193,6 +193,10 @@ public class AlgaTerraSpecimenImport  extends AlgaTerraSpecimenImportBase {
                        return false;\r
                }\r
        }\r
+       \r
+       protected String getDerivedUnitNameSpace(){\r
+               return ECO_FACT_DERIVED_UNIT_NAMESPACE;\r
+       }\r
 \r
 \r
 \r
@@ -485,7 +489,7 @@ public class AlgaTerraSpecimenImport  extends AlgaTerraSpecimenImportBase {
                        result.put(nameSpace, objectMap);\r
 \r
                        //field observation map map\r
-                       nameSpace = AlgaTerraSpecimenImport.ECO_FACT_NAMESPACE;\r
+                       nameSpace = AlgaTerraSpecimenImport.ECO_FACT_FIELD_OBSERVATION_NAMESPACE;\r
                        cdmClass = FieldObservation.class;\r
                        idSet = fieldObservationIdSet;\r
                        Map<String, FieldObservation> fieldObservationMap = (Map<String, FieldObservation>)getCommonService().getSourcedObjectsByIdInSource(cdmClass, idSet, nameSpace);\r
@@ -588,7 +592,7 @@ public class AlgaTerraSpecimenImport  extends AlgaTerraSpecimenImportBase {
         * @see eu.etaxonomy.cdm.io.common.CdmIoBase#isIgnore(eu.etaxonomy.cdm.io.common.IImportConfigurator)\r
         */\r
        protected boolean isIgnore(BerlinModelImportState state){\r
-               return ! ((AlgaTerraImportState)state).getAlgaTerraConfigurator().isDoSpecimen();\r
+               return ! ((AlgaTerraImportState)state).getAlgaTerraConfigurator().isDoEcoFacts();\r
        }\r
        \r
 }\r