Revision 86536e03
Added by Andreas Müller almost 7 years ago
| app-import/src/main/java/eu/etaxonomy/cdm/io/algaterra/AlgaTerraTypeImport.java | ||
|---|---|---|
| 46 | 46 |
import eu.etaxonomy.cdm.model.name.Rank; |
| 47 | 47 |
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation; |
| 48 | 48 |
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus; |
| 49 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
|
|
| 49 |
import eu.etaxonomy.cdm.model.name.TaxonName; |
|
| 50 | 50 |
import eu.etaxonomy.cdm.model.name.TaxonNameFactory; |
| 51 | 51 |
import eu.etaxonomy.cdm.model.occurrence.Collection; |
| 52 | 52 |
import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; |
| ... | ... | |
| 126 | 126 |
|
| 127 | 127 |
|
| 128 | 128 |
|
| 129 |
Set<TaxonNameBase> namesToSave = new HashSet<TaxonNameBase>();
|
|
| 129 |
Set<TaxonName> namesToSave = new HashSet<>();
|
|
| 130 | 130 |
|
| 131 |
Map<String, TaxonNameBase> taxonNameMap = partitioner.getObjectMap(BerlinModelTaxonNameImport.NAMESPACE);
|
|
| 131 |
Map<String, TaxonName> taxonNameMap = partitioner.getObjectMap(BerlinModelTaxonNameImport.NAMESPACE); |
|
| 132 | 132 |
Map<String, DerivedUnit> ecoFactMap = partitioner.getObjectMap(AlgaTerraEcoFactImport.ECO_FACT_FIELD_OBSERVATION_NAMESPACE); |
| 133 | 133 |
Map<String, DerivedUnit> typeSpecimenMap = partitioner.getObjectMap(TYPE_SPECIMEN_FIELD_OBSERVATION_NAMESPACE); |
| 134 | 134 |
Map<String, Reference> refMap = partitioner.getObjectMap(BerlinModelReferenceImport.REFERENCE_NAMESPACE); |
| ... | ... | |
| 198 | 198 |
|
| 199 | 199 |
|
| 200 | 200 |
//Designation |
| 201 |
TaxonNameBase<?,?> name = getTaxonName(state, taxonNameMap, nameId);
|
|
| 201 |
TaxonName<?,?> name = getTaxonName(state, taxonNameMap, nameId); |
|
| 202 | 202 |
SpecimenTypeDesignation designation = SpecimenTypeDesignation.NewInstance(); |
| 203 | 203 |
SpecimenTypeDesignationStatus status = getSpecimenTypeDesignationStatusByKey(typeStatusFk); |
| 204 | 204 |
if (typeStatusFk != null && typeStatusFk.equals(39)){
|
| ... | ... | |
| 336 | 336 |
* @param nameId |
| 337 | 337 |
* @return |
| 338 | 338 |
*/ |
| 339 |
private TaxonNameBase<?,?> getTaxonName(AlgaTerraImportState state, Map<String, TaxonNameBase> taxonNameMap, int nameId) {
|
|
| 340 |
TaxonNameBase<?,?> result;
|
|
| 339 |
private TaxonName<?,?> getTaxonName(AlgaTerraImportState state, Map<String, TaxonName> taxonNameMap, int nameId) {
|
|
| 340 |
TaxonName<?,?> result; |
|
| 341 | 341 |
if (state.getConfig().isDoTaxonNames()){
|
| 342 | 342 |
result = taxonNameMap.get(String.valueOf(nameId)); |
| 343 | 343 |
}else{
|
| ... | ... | |
| 489 | 489 |
|
| 490 | 490 |
//name map |
| 491 | 491 |
nameSpace = BerlinModelTaxonNameImport.NAMESPACE; |
| 492 |
cdmClass = TaxonNameBase.class;
|
|
| 492 |
cdmClass = TaxonName.class; |
|
| 493 | 493 |
idSet = nameIdSet; |
| 494 |
Map<String, TaxonNameBase> objectMap = (Map<String, TaxonNameBase>)getCommonService().getSourcedObjectsByIdInSource(cdmClass, idSet, nameSpace);
|
|
| 494 |
Map<String, TaxonName> objectMap = (Map<String, TaxonName>)getCommonService().getSourcedObjectsByIdInSource(cdmClass, idSet, nameSpace);
|
|
| 495 | 495 |
result.put(nameSpace, objectMap); |
| 496 | 496 |
|
| 497 | 497 |
//eco fact field observation map |
Also available in: Unified diff
fix #6368 rename table and class TaxonNameBase in app-import