Project

General

Profile

« Previous | Next » 

Revision 640d8847

Added by Andreas Müller over 5 years ago

split occurrence and occurrence source import

View differences:

app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/EuroMedActivator.java
103 103
    //taxa
104 104
    static final boolean doTaxa = true;
105 105
    static final boolean doFacts = true;
106
    static final boolean doOccurences = true;
107 106
    static final boolean doRelTaxa = true;
107
    static final boolean doOccurrences = false;
108
    static final boolean doOccurrenceSources = true;
108 109
    static final boolean doCommonNames = true;  //currently takes very long
109 110

  
110 111
  //serious types do not exist in E+M except for name types which are handled in name relations
......
214 215
		config.setDoTaxa(doTaxa ^ invers);
215 216
		config.setDoRelTaxa(doRelTaxa ^ invers);
216 217
		config.setDoFacts(doFacts ^ invers);
217
		config.setDoOccurrence(doOccurences ^ invers);
218
		config.setDoCommonNames(doCommonNames ^ invers);
218
		config.setDoOccurrence(doOccurrences ^ invers);
219
		config.setDoOccurrenceSources(doOccurrenceSources ^ invers);
220
        config.setDoCommonNames(doCommonNames ^ invers);
219 221

  
220 222
		config.setDoMarker(doMarker);
221 223
		config.setDoUser(doUser ^ invers);
app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelImportConfigurator.java
47 47
	private boolean doRelNames = true;
48 48
	private boolean doCommonNames = true;
49 49
	private boolean doOccurrence = true;
50
	private boolean doOccurrenceSources = true;
50 51
	private boolean doMarker = true;
51 52
	private boolean doUser = true;
52 53
	private boolean doFacts = true;
......
356 357
		this.doOccurrence = doOccurrence;
357 358
	}
358 359

  
360
    public boolean isDoOccurrenceSources() {
361
        return doOccurrenceSources;
362
    }
363
    public void setDoOccurrenceSources(boolean doOccurrenceSources) {
364
        this.doOccurrenceSources = doOccurrenceSources;
365
	}
366

  
359 367

  
360 368
	public boolean isDoMarker() {
361 369
		return doMarker;
app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelOccurrenceSourceImport.java
400 400

  
401 401
	@Override
402 402
	protected boolean isIgnore(BerlinModelImportState state){
403
		if (! state.getConfig().isDoOccurrence()){
403
		if (! state.getConfig().isDoOccurrenceSources()){
404 404
			return true;
405 405
		}else{
406 406
			if (!this.checkSqlServerColumnExists(state.getConfig().getSource(), "emOccurrenceSource", "OccurrenceSourceId")){

Also available in: Unified diff