Project

General

Profile

« Previous | Next » 

Revision e1ac7628

Added by Andreas Müller over 11 years ago

add image import validator

View differences:

app-import/src/main/java/eu/etaxonomy/cdm/io/globis/GlobisImageImport.java
18 18
import java.util.Map;
19 19
import java.util.Set;
20 20

  
21
import org.apache.commons.lang.StringUtils;
22 21
import org.apache.log4j.Logger;
23 22
import org.springframework.stereotype.Component;
24 23

  
25
import eu.etaxonomy.cdm.common.media.ImageInfo;
26 24
import eu.etaxonomy.cdm.io.common.IOValidator;
27 25
import eu.etaxonomy.cdm.io.common.ResultSetPartitioner;
28
import eu.etaxonomy.cdm.io.globis.validation.GlobisCurrentSpeciesImportValidator;
26
import eu.etaxonomy.cdm.io.globis.validation.GlobisImageImportValidator;
29 27
import eu.etaxonomy.cdm.model.common.CdmBase;
30 28
import eu.etaxonomy.cdm.model.common.Language;
31 29
import eu.etaxonomy.cdm.model.media.Media;
32
import eu.etaxonomy.cdm.model.name.Rank;
33
import eu.etaxonomy.cdm.model.name.ZoologicalName;
34 30
import eu.etaxonomy.cdm.model.reference.Reference;
35
import eu.etaxonomy.cdm.model.taxon.Classification;
36 31
import eu.etaxonomy.cdm.model.taxon.Taxon;
37
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
38
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
39
import eu.etaxonomy.cdm.strategy.parser.INonViralNameParser;
40
import eu.etaxonomy.cdm.strategy.parser.NonViralNameParserImpl;
41 32

  
42 33

  
43 34
/**
......
201 192

  
202 193

  
203 194

  
204

  
205
	private Taxon getTaxon(GlobisImportState state, ResultSet rs, String subGenus, Rank rank, String author, Map<String, Taxon> taxonMap) {
206
		String key = subGenus + "@" + "subGenusAuthor" + "@" + rank.getTitleCache();
207
		Taxon taxon = taxonMap.get(key);
208
		if (taxon == null){
209
			ZoologicalName name = ZoologicalName.NewInstance(rank);
210
			taxon = Taxon.NewInstance(name, state.getTransactionalSourceReference());
211
			handleAuthorAndYear(author, name);
212
			getTaxonService().save(taxon);
213
		}
214
		
215
		return taxon;
216
	}
217

  
218

  
219

  
220

  
221

  
222 195
	/* (non-Javadoc)
223 196
	 * @see eu.etaxonomy.cdm.io.berlinModel.in.IPartitionedIO#getRelatedObjectsForPartition(java.sql.ResultSet)
224 197
	 */
......
232 205
	 */
233 206
	@Override
234 207
	protected boolean doCheck(GlobisImportState state){
235
		IOValidator<GlobisImportState> validator = new GlobisCurrentSpeciesImportValidator();
208
		IOValidator<GlobisImportState> validator = new GlobisImageImportValidator();
236 209
		return validator.validate(state);
237 210
	}
238 211
	

Also available in: Unified diff