X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib-apps.git/blobdiff_plain/6243a66827527f4e8cad5a649f10e5c90ad6f4f3..2e39072382b887fae4b746d2248dbef7e5bdb414:/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 b0bee112..94d45c84 100644
--- 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
 	protected String getRecordQuery(BerlinModelImportConfigurator config) {
 			String strQuery =   
-            " SELECT PTaxon.RIdentifier as taxonId, Fact.FactId, Fact.RecordBasis, EcoFact.*, " + 
+            " SELECT PTaxon.RIdentifier as taxonId, Fact.FactId, Fact.RecordBasis, EcoFact.*, EcoFact.EcoFactId as unitId, " + 
                " tg.ID AS GazetteerId, tg.L2Code, tg.L3Code, tg.L4Code, tg.Country, tg.ISOCountry, " +
-               " ec.UUID as climateUuid, eh.UUID as habitatUuid, elf.UUID as lifeFormUuid" +
+               " ec.UUID as climateUuid, eh.UUID as habitatUuid, elf.UUID as lifeFormUuid " +
             " FROM Fact " + 
                  " INNER JOIN EcoFact ON Fact.ExtensionFk = EcoFact.EcoFactId " +
                  " INNER JOIN PTaxon ON dbo.Fact.PTNameFk = dbo.PTaxon.PTNameFk AND dbo.Fact.PTRefFk = dbo.PTaxon.PTRefFk " +
@@ -130,7 +130,7 @@ public class AlgaTerraSpecimenImport  extends AlgaTerraSpecimenImportBase {
 		Set<TaxonBase> taxaToSave = new HashSet<TaxonBase>();
 		
 		Map<String, TaxonBase> taxonMap = (Map<String, TaxonBase>) partitioner.getObjectMap(BerlinModelTaxonImport.NAMESPACE);
-		Map<String, DerivedUnit> ecoFactMap = (Map<String, DerivedUnit>) partitioner.getObjectMap(ECO_FACT_NAMESPACE);
+		Map<String, DerivedUnit> ecoFactDerivedUnitMap = (Map<String, DerivedUnit>) partitioner.getObjectMap(ECO_FACT_DERIVED_UNIT_NAMESPACE);
 		
 		ResultSet rs = partitioner.getResultSet();
 
@@ -155,7 +155,7 @@ public class AlgaTerraSpecimenImport  extends AlgaTerraSpecimenImportBase {
 				
 					//facade
 					DerivedUnitType type = makeDerivedUnitType(recordBasis);
-					DerivedUnitFacade facade = getDerivedUnit(state, ecoFactId, ecoFactMap, type);
+					DerivedUnitFacade facade = getDerivedUnit(state, ecoFactId, ecoFactDerivedUnitMap, type);
 					
 					//field observation
 					handleSingleSpecimen(rs, facade, state, partitioner);
@@ -193,6 +193,10 @@ public class AlgaTerraSpecimenImport  extends AlgaTerraSpecimenImportBase {
 			return false;
 		}
 	}
+	
+	protected String getDerivedUnitNameSpace(){
+		return ECO_FACT_DERIVED_UNIT_NAMESPACE;
+	}
 
 
 
@@ -485,7 +489,7 @@ public class AlgaTerraSpecimenImport  extends AlgaTerraSpecimenImportBase {
 			result.put(nameSpace, objectMap);
 
 			//field observation map map
-			nameSpace = AlgaTerraSpecimenImport.ECO_FACT_NAMESPACE;
+			nameSpace = AlgaTerraSpecimenImport.ECO_FACT_FIELD_OBSERVATION_NAMESPACE;
 			cdmClass = FieldObservation.class;
 			idSet = fieldObservationIdSet;
 			Map<String, FieldObservation> fieldObservationMap = (Map<String, FieldObservation>)getCommonService().getSourcedObjectsByIdInSource(cdmClass, idSet, nameSpace);
@@ -588,7 +592,7 @@ public class AlgaTerraSpecimenImport  extends AlgaTerraSpecimenImportBase {
 	 * @see eu.etaxonomy.cdm.io.common.CdmIoBase#isIgnore(eu.etaxonomy.cdm.io.common.IImportConfigurator)
 	 */
 	protected boolean isIgnore(BerlinModelImportState state){
-		return ! ((AlgaTerraImportState)state).getAlgaTerraConfigurator().isDoSpecimen();
+		return ! ((AlgaTerraImportState)state).getAlgaTerraConfigurator().isDoEcoFacts();
 	}
 	
 }