Project

General

Profile

« Previous | Next » 

Revision 60ad1ed0

Added by Andreas Müller almost 10 years ago

latest changes to AT

View differences:

app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelImportBase.java
31 31 
import eu.etaxonomy.cdm.model.common.Language;
32 32 
import eu.etaxonomy.cdm.model.common.User;
33 33 
import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
34 
import eu.etaxonomy.cdm.model.location.Country;
34 35 
import eu.etaxonomy.cdm.model.location.NamedArea;
35 36 
import eu.etaxonomy.cdm.model.location.NamedAreaType;
36 
import eu.etaxonomy.cdm.model.location.Country;
37 37 
import eu.etaxonomy.cdm.model.name.BotanicalName;
38 38 
import eu.etaxonomy.cdm.model.name.Rank;
39 39 
import eu.etaxonomy.cdm.model.reference.Reference;
......
71 71 
		return success;
72 72 
	}
73 73
74 
	protected boolean doIdCreatedUpdatedNotes(BerlinModelImportState state, IdentifiableEntity identifiableEntity, ResultSet rs, long id, String namespace, boolean excludeUpdated)
75 
				throws SQLException{
74 
	protected boolean doIdCreatedUpdatedNotes(BerlinModelImportState state, IdentifiableEntity identifiableEntity, ResultSet rs, long id, String namespace, boolean excludeUpdated, boolean excludeNotes)
75 
			throws SQLException{
76 76 
		boolean success = true;
77 77 
		//id
78 78 
		success &= doId(state, identifiableEntity, id, namespace);
79 79 
		//createdUpdateNotes
80 
		success &= doCreatedUpdatedNotes(state, identifiableEntity, rs, excludeUpdated);
80 
		success &= doCreatedUpdatedNotes(state, identifiableEntity, rs, excludeUpdated, excludeNotes);
81 81 
		return success;
82 82 
	}
83 83 

  		




  ......




  85
  85
  
    
	protected boolean doIdCreatedUpdatedNotes(BerlinModelImportState state, IdentifiableEntity identifiableEntity, ResultSet rs, long id, String namespace)


  		




  86
  86
  
    
			throws SQLException{


  		




  87
  87
  
    
		boolean excludeUpdated = false;


  		




  88
  
  
    
		return doIdCreatedUpdatedNotes(state, identifiableEntity, rs, id, namespace, excludeUpdated);


  		




  
  88
  
    
		return doIdCreatedUpdatedNotes(state, identifiableEntity, rs, id, namespace, excludeUpdated, false);


  		




  89
  89
  
    
	}


  		




  90
  90
  
    
	


  		




  91
  91
  
    
	protected boolean doCreatedUpdatedNotes(BerlinModelImportState state, AnnotatableEntity annotatableEntity, ResultSet rs)


  		




  92
  92
  
    
			throws SQLException{


  		




  93
  93
  
    
		boolean excludeUpdated = false;


  		




  94
  
  
    
		return doCreatedUpdatedNotes(state, annotatableEntity, rs, excludeUpdated);


  		




  
  94
  
    
		return doCreatedUpdatedNotes(state, annotatableEntity, rs, excludeUpdated, false);


  		




  95
  95
  
    
	}


  		




  96
  96
  
    
	


  		




  97
  
  
    
	protected boolean doCreatedUpdatedNotes(BerlinModelImportState state, AnnotatableEntity annotatableEntity, ResultSet rs, boolean excludeUpdated)


  		




  
  97
  
    
	protected boolean doCreatedUpdatedNotes(BerlinModelImportState state, AnnotatableEntity annotatableEntity, ResultSet rs, boolean excludeUpdated, boolean excludeNotes)


  		




  98
  98
  
    
			throws SQLException{


  		




  99
  99
  
    

  		




  100
  100
  
    
		BerlinModelImportConfigurator config = state.getConfig();


  		




  ......




  142
  142
  
    
		


  		




  143
  143
  
    
		


  		




  144
  144
  
    
		//notes


  		




  145
  
  
    
		doNotes(annotatableEntity, notes);


  		




  
  145
  
    
		if (! excludeNotes){


  		




  
  146
  
    
			doNotes(annotatableEntity, notes);


  		




  
  147
  
    
		}


  		




  146
  148
  
    
		return success;


  		




  147
  149
  
    
	}


  		




  148
  150
  
    
	


  		












Also available in:  Unified diff