Project

General

Profile

« Previous | Next » 

Revision bb38665e

Added by Andreas Müller over 10 years ago

reintegrate cdmlib-app-3.3 branch into trunk

View differences:

app-import/src/main/java/eu/etaxonomy/cdm/io/algaterra/AlgaTerraPictureImport.java
29 29 
import eu.etaxonomy.cdm.io.common.ResultSetPartitioner;
30 30 
import eu.etaxonomy.cdm.model.common.CdmBase;
31 31 
import eu.etaxonomy.cdm.model.media.Media;
32 
import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
32 
import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
33 33 
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
34 34 
import eu.etaxonomy.cdm.model.taxon.Taxon;
35 35 
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
......
94 94
95 95 
//		Map<String, DerivedUnitBase> ecoFactMap = (Map<String, DerivedUnitBase>) partitioner.getObjectMap(AlgaTerraSpecimenImportBase.ECO_FACT_DERIVED_UNIT_NAMESPACE);
96 96 
		Map<String, TaxonBase> taxonMap = (Map<String, TaxonBase>) partitioner.getObjectMap(BerlinModelTaxonImport.NAMESPACE);
97 
		Map<String, DerivedUnitBase<?>> specimenMap = (Map<String, DerivedUnitBase<?>>) partitioner.getObjectMap(AlgaTerraFactEcologyImport.FACT_ECOLOGY_NAMESPACE);
97 
		Map<String, DerivedUnit> specimenMap = (Map<String, DerivedUnit>) partitioner.getObjectMap(AlgaTerraFactEcologyImport.FACT_ECOLOGY_NAMESPACE);
98 98
99 99 
		ResultSet rs = partitioner.getResultSet();
100 100 

  		




  ......




  155
  155
  
    

  		




  156
  156
  
    

  		




  157
  157
  
    

  		




  158
  
  
    
	private void handlePictureSpecificFields(ResultSet rs, Media media, AlgaTerraImportState state, Map<String, DerivedUnitBase<?>> specimenMap) throws SQLException {


  		




  
  158
  
    
	private void handlePictureSpecificFields(ResultSet rs, Media media, AlgaTerraImportState state, Map<String, DerivedUnit> specimenMap) throws SQLException {


  		




  159
  159
  
    
		Integer specimenFactId = nullSafeInt(rs, "FactFk");


  		




  160
  160
  
    
		if (specimenFactId != null){


  		




  161
  
  
    
			DerivedUnitBase<?> specimen = specimenMap.get(String.valueOf(specimenFactId));


  		




  
  161
  
    
			DerivedUnit specimen = specimenMap.get(String.valueOf(specimenFactId));


  		




  162
  162
  
    
			if (specimen == null){


  		




  163
  163
  
    
				logger.warn("Specimen not found for FactFK: " + specimenFactId);


  		




  164
  164
  
    
			}else{


  		












Also available in:  Unified diff