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/cyprus/CyprusDistributionImport.java
24 24

  
25 25
import eu.etaxonomy.cdm.api.service.pager.Pager;
26 26
import eu.etaxonomy.cdm.common.CdmUtils;
27
import eu.etaxonomy.cdm.io.common.TdwgAreaProvider;
27 28
import eu.etaxonomy.cdm.io.common.mapping.IInputTransformer;
28 29
import eu.etaxonomy.cdm.io.common.mapping.UndefinedTransformerMethodException;
29 30
import eu.etaxonomy.cdm.io.excel.common.ExcelImporterBase;
30 31
import eu.etaxonomy.cdm.model.common.CdmBase;
32
import eu.etaxonomy.cdm.model.common.OriginalSourceType;
33
import eu.etaxonomy.cdm.model.common.TermType;
31 34
import eu.etaxonomy.cdm.model.common.TermVocabulary;
32 35
import eu.etaxonomy.cdm.model.description.DescriptionBase;
33 36
import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
......
38 41
import eu.etaxonomy.cdm.model.location.NamedArea;
39 42
import eu.etaxonomy.cdm.model.location.NamedAreaLevel;
40 43
import eu.etaxonomy.cdm.model.location.NamedAreaType;
41
import eu.etaxonomy.cdm.model.location.TdwgArea;
42
import eu.etaxonomy.cdm.model.location.WaterbodyOrCountry;
44
import eu.etaxonomy.cdm.model.location.Country;
43 45
import eu.etaxonomy.cdm.model.name.BotanicalName;
44 46
import eu.etaxonomy.cdm.model.reference.Reference;
45 47
import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
......
112 114
		CyprusDistributionRow taxonLight = state.getCyprusDistributionRow();
113 115
		//species name
114 116
		String taxonStr = taxonLight.getSpecies();
115
		if ("#entf?llt#".equalsIgnoreCase(taxonStr)){
116
			logger.warn("entf?llt");
117
		if ("#entfllt#".equalsIgnoreCase(taxonStr)){
118
			logger.warn("entfllt");
117 119
			return;
118 120
		}
119 121
		Taxon taxon = getTaxon(state, taxonStr);
......
144 146
			if (distributionStr.contains(String.valueOf(i))){
145 147
				NamedArea area = this.divisions.get(String.valueOf(i));
146 148
				Distribution distribution = Distribution.NewInstance(area, status);
147
				distribution.addSource(null, null, ref, null);
149
				distribution.addSource(OriginalSourceType.PrimaryTaxonomicSource, null, null, ref, null);
148 150
				description.addElement(distribution);
149 151
			}
150 152
		}
......
154 156
		Reference<?> excelRef = state.getConfig().getSourceReference();
155 157
		TaxonDescription desc = TaxonDescription.NewInstance(taxon, false);
156 158
		desc.setTitleCache(excelRef.getTitleCache() + " for " + taxon.getTitleCache(), true);
157
		desc.addSource(null, null, excelRef, null);
159
		desc.addSource(OriginalSourceType.Import, null, null, excelRef, null);
158 160
		return desc;
159 161
	}
160 162

  
......
360 362
			getTermService().save(areaLevel);
361 363
		}
362 364
		
363
		TermVocabulary<NamedArea> areaVocabulary = getVocabulary(CyprusTransformer.uuidCyprusDivisionsVocabulary, "Cyprus devisions", "Cyprus divisions", null, null, true, NamedArea.NewInstance());
364
		TdwgArea tdwg4Cyprus = (TdwgArea)getTermService().find(UUID.fromString("9d447b51-e363-4dde-ae40-84c55679983c"));
365
		WaterbodyOrCountry isoCountryCyprus = (WaterbodyOrCountry)getTermService().find(UUID.fromString("4b13d6b8-7eca-4d42-8172-f2018051ca19"));
365
		TermVocabulary<NamedArea> areaVocabulary = getVocabulary(TermType.NamedArea, CyprusTransformer.uuidCyprusDivisionsVocabulary, "Cyprus devisions", "Cyprus divisions", null, null, true, NamedArea.NewInstance());
366
		NamedArea tdwg4Cyprus = (NamedArea)getTermService().find(UUID.fromString("9d447b51-e363-4dde-ae40-84c55679983c"));
367
		Country isoCountryCyprus = (Country)getTermService().find(UUID.fromString("4b13d6b8-7eca-4d42-8172-f2018051ca19"));
366 368
		
367 369
		for(int i = 1; i <= 8; i++){
368 370
			UUID divisionUuid = transformer.getNamedAreaUuid(String.valueOf(i));

Also available in: Unified diff