Project

General

Profile

« Previous | Next » 

Revision d0c17714

Added by Andreas Müller almost 6 years ago

use E+M specific vocabulary for marker types

View differences:

app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelCommonNamesImport.java
39 39
import eu.etaxonomy.cdm.model.common.Marker;
40 40
import eu.etaxonomy.cdm.model.common.MarkerType;
41 41
import eu.etaxonomy.cdm.model.common.Representation;
42
import eu.etaxonomy.cdm.model.common.TermType;
43 42
import eu.etaxonomy.cdm.model.common.TermVocabulary;
44 43
import eu.etaxonomy.cdm.model.description.CommonTaxonName;
45 44
import eu.etaxonomy.cdm.model.description.DescriptionElementSource;
......
333 332
							logger.warn("Taxon name or misapplied name reference is null for common name " + commonNameId);
334 333
						}else{
335 334
							misappliedNameTaxon = Taxon.NewInstance(nameUsedInSource, sec);
336
							MarkerType misCommonNameMarker = getMarkerType(state, BerlinModelTransformer.uuidMisappliedCommonName,"Misapplied Common Name in Berlin Model", "Misapplied taxon was automatically created by Berlin Model import for a common name with a misapplied name reference", "MCN");
335
							MarkerType misCommonNameMarker = getMarkerType(state, BerlinModelTransformer.uuidMisappliedCommonName,"Misapplied Common Name in Berlin Model",
336
							        "Misapplied taxon was automatically created by Berlin Model import for a common name with a misapplied name reference", "MCN", getEuroMedMarkerTypeVoc());
337 337
							Marker marker = Marker.NewInstance(misCommonNameMarker, true);
338 338
							misappliedNameTaxon.addMarker(marker);
339 339
							taxaToSave.add(misappliedNameTaxon);
......
380 380

  
381 381
				//status
382 382
				if (isNotBlank(status)){
383
				    TermVocabulary<MarkerType> markerTypeVoc = getVocabulary(TermType.MarkerType, BerlinModelTransformer.uuidVocEMMarkerType,
384
				            "Euro+Med marker type vocabulary", "E+M marker types", null, null, false, MarkerType.COMPLETE());
383
				    TermVocabulary<MarkerType> markerTypeVoc = getEuroMedMarkerTypeVoc();
385 384
				    MarkerType recommendedMarkerType = getMarkerType( state, COMMONNAME_STATUS_RECOMMENDED_UUID, "recommended","If the common name has the status recommended (see also status 'synonym', if none of them is true the default status is 'unassessed')",
386 385
				            "recommended", markerTypeVoc);
387 386
					MarkerType synonymMarkerType = getMarkerType( state, COMMONNAME_STATUS_SYNONYM_UUID, "synonym","If the common name has the status synonym (see also status 'recommended', if none of them is true the default status is 'unassessed')",
......
426 425

  
427 426
	}
428 427

  
428

  
429 429
    /**
430 430
	 * @param iso6392Map
431 431
	 * @param iso639_2

Also available in: Unified diff