Revision 2e390723
Added by Andreas Müller over 11 years ago
| app-import/src/main/java/eu/etaxonomy/cdm/io/algaterra/AlgaTerraSiteImagesImport.java | ||
|---|---|---|
| 156 | 156 |
*/ |
| 157 | 157 |
public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs) {
|
| 158 | 158 |
String nameSpace; |
| 159 |
Class cdmClass; |
|
| 159 |
Class<?> cdmClass;
|
|
| 160 | 160 |
Set<String> idSet; |
| 161 | 161 |
Map<Object, Map<String, ? extends CdmBase>> result = new HashMap<Object, Map<String, ? extends CdmBase>>(); |
| 162 | 162 |
|
| ... | ... | |
| 167 | 167 |
handleForeignKey(rs, ecoFactIdSet, "EcoFactFk"); |
| 168 | 168 |
} |
| 169 | 169 |
|
| 170 |
//type specimen map
|
|
| 171 |
nameSpace = AlgaTerraSpecimenImportBase.ECO_FACT_DERIVED_UNIT_NAMESPACE;
|
|
| 172 |
cdmClass = DerivedUnitBase.class;
|
|
| 170 |
//field observation map
|
|
| 171 |
nameSpace = AlgaTerraSpecimenImportBase.ECO_FACT_FIELD_OBSERVATION_NAMESPACE;
|
|
| 172 |
cdmClass = FieldObservation.class;
|
|
| 173 | 173 |
idSet = ecoFactIdSet; |
| 174 |
Map<String, DerivedUnitBase> typeSpecimenMap = (Map<String,DerivedUnitBase>)getCommonService().getSourcedObjectsByIdInSource(cdmClass, idSet, nameSpace);
|
|
| 175 |
result.put(nameSpace, typeSpecimenMap);
|
|
| 174 |
Map<String, FieldObservation> fieldObservationMap = (Map<String,FieldObservation>)getCommonService().getSourcedObjectsByIdInSource(cdmClass, idSet, nameSpace);
|
|
| 175 |
result.put(nameSpace, fieldObservationMap);
|
|
| 176 | 176 |
|
| 177 | 177 |
|
| 178 | 178 |
} catch (SQLException e) {
|
| ... | ... | |
| 214 | 214 |
*/ |
| 215 | 215 |
protected boolean isIgnore(BerlinModelImportState bmState){
|
| 216 | 216 |
AlgaTerraImportConfigurator config = ((AlgaTerraImportState) bmState).getAlgaTerraConfigurator(); |
| 217 |
// return ! ( config.isDoTypes() && config.isDoImages()) ; |
|
| 218 |
return false; |
|
| 217 |
return ! ( config.isDoEcoFacts() && config.isDoImages()) ; |
|
| 219 | 218 |
} |
| 220 | 219 |
|
| 221 | 220 |
} |
| app-import/src/main/java/eu/etaxonomy/cdm/io/algaterra/AlgaTerraVoucherImagesImport.java | ||
|---|---|---|
| 213 | 213 |
*/ |
| 214 | 214 |
protected boolean isIgnore(BerlinModelImportState bmState){
|
| 215 | 215 |
AlgaTerraImportConfigurator config = ((AlgaTerraImportState) bmState).getAlgaTerraConfigurator(); |
| 216 |
// return ! ( config.isDoTypes() && config.isDoImages()) ; |
|
| 217 |
return false; |
|
| 216 |
return ! ( config.isDoEcoFacts() && config.isDoImages()) ; |
|
| 218 | 217 |
} |
| 219 | 218 |
|
| 220 | 219 |
} |
Also available in: Unified diff
change doSpecimen to doEcoFacts