Revision bb38665e
Added by Andreas Müller over 10 years ago
app-import/src/main/java/eu/etaxonomy/cdm/io/algaterra/AlgaTerraSiteImagesImport.java | ||
---|---|---|
26 | 26 |
import eu.etaxonomy.cdm.io.common.ResultSetPartitioner; |
27 | 27 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
28 | 28 |
import eu.etaxonomy.cdm.model.media.Media; |
29 |
import eu.etaxonomy.cdm.model.occurrence.FieldObservation;
|
|
29 |
import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
|
|
30 | 30 |
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; |
31 | 31 |
|
32 | 32 |
|
... | ... | |
85 | 85 |
|
86 | 86 |
Set<SpecimenOrObservationBase> unitsToSave = new HashSet<SpecimenOrObservationBase>(); |
87 | 87 |
|
88 |
Map<String, FieldObservation> ecoFactFieldObservationMap = (Map<String, FieldObservation>) partitioner.getObjectMap(AlgaTerraSpecimenImportBase.ECO_FACT_FIELD_OBSERVATION_NAMESPACE);
|
|
88 |
Map<String, FieldUnit> ecoFactFieldObservationMap = (Map<String, FieldUnit>) partitioner.getObjectMap(AlgaTerraSpecimenImportBase.ECO_FACT_FIELD_OBSERVATION_NAMESPACE);
|
|
89 | 89 |
|
90 | 90 |
ResultSet rs = partitioner.getResultSet(); |
91 | 91 |
|
... | ... | |
107 | 107 |
try { |
108 | 108 |
|
109 | 109 |
//TODO use deduplicated ecofact |
110 |
FieldObservation fieldObservation = ecoFactFieldObservationMap.get(String.valueOf(ecoFactFk));
|
|
110 |
FieldUnit fieldObservation = ecoFactFieldObservationMap.get(String.valueOf(ecoFactFk));
|
|
111 | 111 |
|
112 | 112 |
if (fieldObservation == null){ |
113 | 113 |
logger.warn("Could not find eco fact field observation (" + ecoFactFk +") for site image " + figureId); |
... | ... | |
168 | 168 |
|
169 | 169 |
//field observation map |
170 | 170 |
nameSpace = AlgaTerraSpecimenImportBase.ECO_FACT_FIELD_OBSERVATION_NAMESPACE; |
171 |
cdmClass = FieldObservation.class;
|
|
171 |
cdmClass = FieldUnit.class;
|
|
172 | 172 |
idSet = ecoFactIdSet; |
173 |
Map<String, FieldObservation> fieldObservationMap = (Map<String,FieldObservation>)getCommonService().getSourcedObjectsByIdInSource(cdmClass, idSet, nameSpace);
|
|
173 |
Map<String, FieldUnit> fieldObservationMap = (Map<String,FieldUnit>)getCommonService().getSourcedObjectsByIdInSource(cdmClass, idSet, nameSpace);
|
|
174 | 174 |
result.put(nameSpace, fieldObservationMap); |
175 | 175 |
|
176 | 176 |
|
Also available in: Unified diff
reintegrate cdmlib-app-3.3 branch into trunk