Project

General

Profile

« Previous | Next » 

Revision 9900f429

Added by Andreas Müller about 10 years ago

adapt pesi import to new IPartionedIO signature

View differences:

cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsAreaImport.java
37 37
/**
38 38
 * @author a.mueller
39 39
 * @created 20.02.2010
40
 * @version 1.0
41 40
 */
42 41
@Component
43 42
public class ErmsAreaImport  extends ErmsImportBase<NamedArea> implements IMappingImport<NamedArea, ErmsImportState>{
43
	@SuppressWarnings("unused")
44 44
	private static final Logger logger = Logger.getLogger(ErmsAreaImport.class);
45 45

  
46
	private DbImportMapping mapping;
46
	private DbImportMapping<?,?> mapping;
47 47
	
48 48
	
49 49
	private int modCount = 10000;
50 50
	private static final String pluralString = "areas";
51 51
	private static final String dbTableName = "gu";
52
	private static final Class cdmTargetClass = NamedArea.class;
52
	private static final Class<?> cdmTargetClass = NamedArea.class;
53 53

  
54 54
	public ErmsAreaImport(){
55 55
		super(pluralString, dbTableName, cdmTargetClass);
......
86 86
	}
87 87
	
88 88

  
89
	/* (non-Javadoc)
90
	 * @see eu.etaxonomy.cdm.io.berlinModel.in.IPartitionedIO#getRelatedObjectsForPartition(java.sql.ResultSet)
91
	 */
92
	public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs) {
89
	@Override
90
	public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs, ErmsImportState state) {
93 91
		Map<Object, Map<String, ? extends CdmBase>> result = new HashMap<Object, Map<String, ? extends CdmBase>>();
94 92
		return result;  //not needed
95 93
	}
96 94
	
97

  
98
	/* (non-Javadoc)
99
	 * @see eu.etaxonomy.cdm.io.common.mapping.IMappingImport#createObject(java.sql.ResultSet)
100
	 */
95
	@Override
101 96
	public NamedArea createObject(ResultSet rs, ErmsImportState state) throws SQLException {
102 97
		int id = rs.getInt("id");
103 98
		String strGuName = rs.getString("gu_name");
......
112 107
		return area;
113 108
	}
114 109

  
115
	/* (non-Javadoc)
116
	 * @see eu.etaxonomy.cdm.io.common.CdmIoBase#doCheck(eu.etaxonomy.cdm.io.common.IImportConfigurator)
117
	 */
118 110
	@Override
119 111
	protected boolean doCheck(ErmsImportState state){
120 112
		IOValidator<ErmsImportState> validator = new ErmsAreaImportValidator();
121 113
		return validator.validate(state);
122 114
	}
123 115
	
124
	
125
	/* (non-Javadoc)
126
	 * @see eu.etaxonomy.cdm.io.common.CdmIoBase#isIgnore(eu.etaxonomy.cdm.io.common.IImportConfigurator)
127
	 */
116
	@Override
128 117
	protected boolean isIgnore(ErmsImportState state){
129 118
		//TODO
130 119
//		return ! state.getConfig().isDoAreas();
cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsDrImport.java
39 39
/**
40 40
 * @author a.mueller
41 41
 * @created 20.02.2010
42
 * @version 1.0
43 42
 */
44 43
@Component
45 44
public class ErmsDrImport  extends ErmsImportBase<Distribution> {
......
56 55
		super(pluralString, dbTableName, cdmTargetClass);
57 56
	}
58 57

  
59

  
60
	/* (non-Javadoc)
61
	 * @see eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportBase#getRecordQuery(eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportConfigurator)
62
	 */
63 58
	@Override
64 59
	protected String getRecordQuery(ErmsImportConfigurator config) {
65 60
		String strRecordQuery = 
......
111 106
		return mapping;
112 107
	}
113 108
	
114
	/* (non-Javadoc)
115
	 * @see eu.etaxonomy.cdm.io.berlinModel.in.IPartitionedIO#getRelatedObjectsForPartition(java.sql.ResultSet)
116
	 */
117
	public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs) {
109

  
110
	@Override
111
	public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs, ErmsImportState state) {
118 112
		String nameSpace;
119 113
		Class<?> cdmClass;
120 114
		Set<String> idSet;
cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsImageImport.java
33 33
/**
34 34
 * @author a.mueller
35 35
 * @created 20.02.2010
36
 * @version 1.0
37 36
 */
38 37
@Component
39 38
public class ErmsImageImport  extends ErmsImportBase<TextData> {
......
51 50
		super(pluralString, dbTableName, cdmTargetClass);
52 51
	}
53 52

  
54

  
55
	/* (non-Javadoc)
56
	 * @see eu.etaxonomy.cdm.io.erms.ErmsImportBase#getIdQuery()
57
	 */
58 53
	@Override
59 54
	protected String getIdQuery() {
60 55
		String strIdQuery = 
......
65 60
	}
66 61

  
67 62

  
68
	/* (non-Javadoc)
69
	 * @see eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportBase#getRecordQuery(eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportConfigurator)
70
	 */
71 63
	@Override
72 64
	protected String getRecordQuery(ErmsImportConfigurator config) {
73 65
		String strRecordQuery = 
......
78 70
		return strRecordQuery;
79 71
	}
80 72

  
81
	/* (non-Javadoc)
82
	 * @see eu.etaxonomy.cdm.io.erms.ErmsImportBase#getMapping()
83
	 */
73
	@Override
84 74
	protected DbImportMapping<ErmsImportState, ErmsImportConfigurator> getMapping() {
85 75
		if (mapping == null){
86 76
			mapping = new DbImportMapping<ErmsImportState, ErmsImportConfigurator>();
......
93 83
		return mapping;
94 84
	}
95 85
	
96
	/* (non-Javadoc)
97
	 * @see eu.etaxonomy.cdm.io.berlinModel.in.IPartitionedIO#getRelatedObjectsForPartition(java.sql.ResultSet)
98
	 */
99
	public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs) {
86
	@Override
87
	public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs, ErmsImportState state) {
100 88
		String nameSpace;
101 89
		Class<?> cdmClass;
102 90
		Set<String> idSet;
......
124 112
	@Override
125 113
	protected int divideCountBy() { return devideCountBy;}
126 114
	
127
	/* (non-Javadoc)
128
	 * @see eu.etaxonomy.cdm.io.common.CdmIoBase#doCheck(eu.etaxonomy.cdm.io.common.IImportConfigurator)
129
	 */
115

  
130 116
	@Override
131 117
	protected boolean doCheck(ErmsImportState state){
132 118
		IOValidator<ErmsImportState> validator = new ErmsImageImportValidator();
......
134 120
	}
135 121

  
136 122
	
137
	/* (non-Javadoc)
138
	 * @see eu.etaxonomy.cdm.io.common.CdmIoBase#isIgnore(eu.etaxonomy.cdm.io.common.IImportConfigurator)
139
	 */
123
	@Override
140 124
	protected boolean isIgnore(ErmsImportState state){
141 125
		return ! state.getConfig().isDoImages();
142 126
	}
cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsImportRankMap.java
32 32
/**
33 33
 * @author a.mueller
34 34
 * @created 01.03.2010
35
 * @version 1.0
36 35
 */
37 36
@Component
38 37
public class ErmsImportRankMap extends ErmsImportBase<Rank>{
......
48 47
		super(null, null, null);
49 48
	}
50 49

  
51
	
52
	/* (non-Javadoc)
53
	 * @see eu.etaxonomy.cdm.io.common.CdmIoBase#invoke(eu.etaxonomy.cdm.io.common.IoStateBase)
54
	 */
50

  
51
	@Override
55 52
	public boolean invoke (ErmsImportState state){
56 53
		rankMap = new HashMap<Integer, Map<Integer,Rank>>();
57 54
		Source source = state.getConfig().getSource() ;
......
107 104
	}
108 105

  
109 106

  
110
	/* (non-Javadoc)
111
	 * @see eu.etaxonomy.cdm.io.common.CdmIoBase#doCheck(eu.etaxonomy.cdm.io.common.IoStateBase)
112
	 */
113 107
	@Override
114 108
	protected boolean doCheck(ErmsImportState state) {
115
		IOValidator rankImport = new ErmsRankImportValidator();
109
		IOValidator<ErmsImportState> rankImport = new ErmsRankImportValidator();
116 110
		return rankImport.validate(state);
117 111
	}
118 112

  
119 113

  
120
	/* (non-Javadoc)
121
	 * @see eu.etaxonomy.cdm.io.erms.ErmsImportBase#getRecordQuery(eu.etaxonomy.cdm.io.erms.ErmsImportConfigurator)
122
	 */
123 114
	@Override
124 115
	protected String getRecordQuery(ErmsImportConfigurator config) {
125 116
		// TODO Auto-generated method stub
126 117
		return null;
127 118
	}
128 119

  
129
	
130
	/* (non-Javadoc)
131
	 * @see eu.etaxonomy.cdm.io.common.CdmIoBase#isIgnore(eu.etaxonomy.cdm.io.common.IoStateBase)
132
	 */
120

  
133 121
	@Override
134 122
	protected boolean isIgnore(ErmsImportState state) {
135 123
		return false;  //should always be called
136 124
	}
137 125

  
138

  
139
	/* (non-Javadoc)
140
	 * @see eu.etaxonomy.cdm.io.common.IPartitionedIO#getRelatedObjectsForPartition(java.sql.ResultSet)
141
	 */
142
	public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs) {
126
	@Override
127
	public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs, ErmsImportState state) {
143 128
		return null;  // not needed
144 129
	}
145 130

  
146
	/* (non-Javadoc)
147
	 * @see eu.etaxonomy.cdm.io.common.mapping.IMappingImport#createObject(java.sql.ResultSet, eu.etaxonomy.cdm.io.common.ImportStateBase)
148
	 */
149 131
	public Rank createObject(ResultSet rs, ErmsImportState state)
150 132
			throws SQLException {
151 133
		return null;  // not needed
152 134
	}
153 135

  
154 136

  
155
	/* (non-Javadoc)
156
	 * @see eu.etaxonomy.cdm.io.erms.ErmsImportBase#getMapping()
157
	 */
158 137
	@Override
159 138
	protected DbImportMapping<?, ?> getMapping() {
160 139
		return null;  //not needed
161 140
	}
162 141
	
163
	
164
	
165 142
}
cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsLinkImport.java
33 33
/**
34 34
 * @author a.mueller
35 35
 * @created 20.02.2010
36
 * @version 1.0
37 36
 */
38 37
@Component
39 38
public class ErmsLinkImport  extends ErmsImportBase<TaxonBase> {
39
	@SuppressWarnings("unused")
40 40
	private static final Logger logger = Logger.getLogger(ErmsLinkImport.class);
41 41

  
42 42
	private DbImportMapping<ErmsImportState,ErmsImportConfigurator> mapping;
......
49 49
		super(pluralString, dbTableName, cdmTargetClass);
50 50
	}
51 51

  
52

  
53
	/* (non-Javadoc)
54
	 * @see eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportBase#getRecordQuery(eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportConfigurator)
55
	 */
56 52
	@Override
57 53
	protected String getRecordQuery(ErmsImportConfigurator config) {
58 54
		String strRecordQuery = 
......
78 74
		}
79 75
		return mapping;
80 76
	}
81
	
82 77

  
83
	/* (non-Javadoc)
84
	 * @see eu.etaxonomy.cdm.io.berlinModel.in.IPartitionedIO#getRelatedObjectsForPartition(java.sql.ResultSet)
85
	 */
86
	public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs) {
78
	@Override
79
	public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs, ErmsImportState state) {
87 80
		String nameSpace;
88
		Class cdmClass;
81
		Class<?> cdmClass;
89 82
		Set<String> idSet;
90 83
		Map<Object, Map<String, ? extends CdmBase>> result = new HashMap<Object, Map<String, ? extends CdmBase>>();
91 84
		
......
108 101
		}
109 102
		return result;
110 103
	}
111
	
112
	/* (non-Javadoc)
113
	 * @see eu.etaxonomy.cdm.io.common.CdmIoBase#doCheck(eu.etaxonomy.cdm.io.common.IImportConfigurator)
114
	 */
104

  
115 105
	@Override
116 106
	protected boolean doCheck(ErmsImportState state){
117 107
		IOValidator<ErmsImportState> validator = new ErmsLinkImportValidator();
118 108
		return validator.validate(state);
119 109
	}
120 110
	
121
	
122
	/* (non-Javadoc)
123
	 * @see eu.etaxonomy.cdm.io.common.CdmIoBase#isIgnore(eu.etaxonomy.cdm.io.common.IImportConfigurator)
124
	 */
111
	@Override
125 112
	protected boolean isIgnore(ErmsImportState state){
126 113
		return ! state.getConfig().isDoLinks();
127 114
	}
cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsNotesImport.java
37 37
/**
38 38
 * @author a.mueller
39 39
 * @created 20.02.2010
40
 * @version 1.0
41 40
 */
42 41
@Component
43 42
public class ErmsNotesImport  extends ErmsImportBase<Annotation> {
......
83 82
	}
84 83
	
85 84

  
86
	/* (non-Javadoc)
87
	 * @see eu.etaxonomy.cdm.io.berlinModel.in.IPartitionedIO#getRelatedObjectsForPartition(java.sql.ResultSet)
88
	 */
89
	public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs) {
85
	@Override
86
	public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs, ErmsImportState state) {
90 87
		String nameSpace;
91 88
		Class<?> cdmClass;
92 89
		Set<String> idSet;
......
123 120
		}
124 121
		return result;
125 122
	}
126
	
127
	/* (non-Javadoc)
128
	 * @see eu.etaxonomy.cdm.io.common.CdmIoBase#doCheck(eu.etaxonomy.cdm.io.common.IImportConfigurator)
129
	 */
123

  
130 124
	@Override
131 125
	protected boolean doCheck(ErmsImportState state){
132 126
		IOValidator<ErmsImportState> validator = new ErmsNoteImportValidator();
133 127
		return validator.validate(state);
134 128
	}
135 129
	
136
	
137
	/* (non-Javadoc)
138
	 * @see eu.etaxonomy.cdm.io.common.CdmIoBase#isIgnore(eu.etaxonomy.cdm.io.common.IImportConfigurator)
139
	 */
130
	@Override
140 131
	protected boolean isIgnore(ErmsImportState state){
141 132
		return ! state.getConfig().isDoNotes();
142 133
	}
cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsNotesSourcesImport.java
32 32
/**
33 33
 * @author a.mueller
34 34
 * @created 12.03.2010
35
 * @version 1.0
36 35
 */
37 36
@Component
38 37
public class ErmsNotesSourcesImport extends ErmsImportBase<CommonTaxonName> {
......
44 43
	
45 44
	private static String pluralString = "note sources";
46 45
	private static String dbTableName = "notes_sources";
47
	private static final Class cdmTargetClass = DescriptionElementSource.class;
46
	private static final Class<?> cdmTargetClass = DescriptionElementSource.class;
48 47

  
49
	private DbImportMapping mapping;
48
	private DbImportMapping<?,?> mapping;
50 49

  
51 50
	
52 51
//******************************************* CONSTRUCTOR *******************************	
......
74 73
		return strQuery;
75 74
	}
76 75

  
77
	/* (non-Javadoc)
78
	 * @see eu.etaxonomy.cdm.io.erms.ErmsImportBase#getIdQuery()
79
	 */
80 76
	@Override
81 77
	protected String getIdQuery() {
82 78
		String strQuery = 
......
86 82
		return strQuery;
87 83
	}
88 84
	
89
	/* (non-Javadoc)
90
	 * @see eu.etaxonomy.cdm.io.erms.ErmsImportBase#getMapping()
91
	 */
92
	protected DbImportMapping getMapping() {
85
	@Override
86
	protected DbImportMapping<?,?> getMapping() {
93 87
		if (mapping == null){
94 88
			mapping = new DbImportMapping();
95 89
			String vernacularNamespace = ErmsVernacularImport.VERNACULAR_NAMESPACE;
......
99 93
		return mapping;
100 94
	}
101 95

  
102
	/* (non-Javadoc)
103
	 * @see eu.etaxonomy.cdm.io.common.IPartitionedIO#getRelatedObjectsForPartition(java.sql.ResultSet)
104
	 */
105
	public Map getRelatedObjectsForPartition(ResultSet rs) {
96
	@Override
97
	public Map getRelatedObjectsForPartition(ResultSet rs, ErmsImportState state) {
106 98
		String nameSpace;
107
		Class cdmClass;
99
		Class<?> cdmClass;
108 100
		Set<String> idSet;
109 101
		Map<Object, Map<String, ? extends CdmBase>> result = new HashMap<Object, Map<String, ? extends CdmBase>>();
110 102
		
......
137 129
		return result;
138 130
	}
139 131
	
140

  
141
	/* (non-Javadoc)
142
	 * @see eu.etaxonomy.cdm.io.common.CdmIoBase#doCheck(eu.etaxonomy.cdm.io.common.IoStateBase)
143
	 */
144 132
	@Override
145 133
	protected boolean doCheck(ErmsImportState state) {
146 134
		IOValidator<ErmsImportState> validator = new ErmsNoteSourceImportValidator();
147 135
		return validator.validate(state);
148 136
	}
149 137
	
150
	
151
	/* (non-Javadoc)
152
	 * @see eu.etaxonomy.cdm.io.common.CdmIoBase#isIgnore(eu.etaxonomy.cdm.io.common.IoStateBase)
153
	 */
154 138
	@Override
155 139
	protected boolean isIgnore(ErmsImportState state) {
156 140
		boolean isDo = state.getConfig().isDoVernaculars() && state.getConfig().isDoVernaculars();
cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsReferenceImport.java
127 127
	/* (non-Javadoc)
128 128
	 * @see eu.etaxonomy.cdm.io.berlinModel.in.IPartitionedIO#getRelatedObjectsForPartition(java.sql.ResultSet)
129 129
	 */
130
	public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs) {
130
	public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs, ErmsImportState state) {
131 131
		Map<Object, Map<String, ? extends CdmBase>> result = new HashMap<Object, Map<String, ? extends CdmBase>>();
132 132
		return result;  //not needed
133 133
	}
cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsSourceUsesImport.java
362 362
	
363 363
//************************************ RELATED OBJECTS *************************************************/	
364 364
	
365
	/* (non-Javadoc)
366
	 * @see eu.etaxonomy.cdm.io.berlinModel.in.IPartitionedIO#getRelatedObjectsForPartition(java.sql.ResultSet)
367
	 */
368
	public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs) {
365
	@Override
366
	public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs, ErmsImportState state) {
369 367
		String nameSpace;
370 368
		Class<?> cdmClass;
371 369
		Set<String> idSet;
cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsTaxonImport.java
49 49
/**
50 50
 * @author a.mueller
51 51
 * @created 20.02.2010
52
 * @version 1.0
53 52
 */
54 53
@Component
55 54
public class ErmsTaxonImport  extends ErmsImportBase<TaxonBase<?>> implements IMappingImport<TaxonBase<?>, ErmsImportState>{
......
203 202

  
204 203

  
205 204

  
206
	/* (non-Javadoc)
207
	 * @see eu.etaxonomy.cdm.io.berlinModel.in.IPartitionedIO#getRelatedObjectsForPartition(java.sql.ResultSet)
208
	 */
209
	public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs) {
205
	@Override
206
	public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs, ErmsImportState state) {
210 207
		String nameSpace;
211
		Class cdmClass;
208
		Class<?> cdmClass;
212 209
		Set<String> idSet;
213 210
		Map<Object, Map<String, ? extends CdmBase>> result = new HashMap<Object, Map<String, ? extends CdmBase>>();
214 211
		
......
232 229
		return result;
233 230
	}
234 231
	
235

  
236
	/* (non-Javadoc)
237
	 * @see eu.etaxonomy.cdm.io.common.mapping.IMappingImport#createObject(java.sql.ResultSet)
238
	 */
232
	@Override
239 233
	public TaxonBase<?> createObject(ResultSet rs, ErmsImportState state) throws SQLException {
240 234
		int statusId = rs.getInt("status_id");
241 235
//		Object accTaxonId = rs.getObject("tu_acctaxon");
cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsTaxonRelationImport.java
34 34
/**
35 35
 * @author a.mueller
36 36
 * @created 09.03.2010
37
 * @version 1.0
38 37
 */
39 38
@Component
40 39
public class ErmsTaxonRelationImport extends ErmsImportBase<TaxonBase<?>> implements ICheckIgnoreMapper{
......
54 53
		super(pluralString, dbTableName, cdmTargetClass);
55 54
	}
56 55

  
57
	/* (non-Javadoc)
58
	 * @see eu.etaxonomy.cdm.io.erms.ErmsImportBase#getMapping()
59
	 */
56

  
57
	@Override
60 58
	protected DbImportMapping<ErmsImportState, ErmsImportConfigurator> getMapping() {
61 59
		if (mapping == null){
62 60
			mapping = new DbImportMapping<ErmsImportState, ErmsImportConfigurator>();
......
96 94
		this.state = state;
97 95
		super.doInvoke(state);
98 96
	}
99
	
100
	/* (non-Javadoc)
101
	 * @see eu.etaxonomy.cdm.io.berlinModel.in.IPartitionedIO#getRelatedObjectsForPartition(java.sql.ResultSet)
102
	 */
103
	public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs) {
97

  
98
	@Override
99
	public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs, ErmsImportState state) {
104 100
		String nameSpace;
105 101
		Class<?> cdmClass;
106 102
		Set<String> idSet;
......
184 180
		return result;
185 181
	}
186 182
	
187
	/* (non-Javadoc)
188
	 * @see eu.etaxonomy.cdm.io.common.mapping.IMappingImport#createObject(java.sql.ResultSet, eu.etaxonomy.cdm.io.common.ImportStateBase)
189
	 */
190
	public TaxonBase<?> createObject(ResultSet rs, ErmsImportState state) throws SQLException {
191
		// not needed
192
		return null;
193
	}
194
	
195 183
	
196

  
197
	/* (non-Javadoc)
198
	 * @see eu.etaxonomy.cdm.io.common.CdmIoBase#doCheck(eu.etaxonomy.cdm.io.common.IImportConfigurator)
199
	 */
200 184
	@Override
201 185
	protected boolean doCheck(ErmsImportState state){
202 186
//		IOValidator<ErmsImportState> validator = new ErmsTaxonImportValidator();
......
204 188
		return true;
205 189
	}
206 190
	
207
	
208
	/* (non-Javadoc)
209
	 * @see eu.etaxonomy.cdm.io.common.CdmIoBase#isIgnore(eu.etaxonomy.cdm.io.common.IImportConfigurator)
210
	 */
191
	@Override
211 192
	protected boolean isIgnore(ErmsImportState state){
212 193
		return ! state.getConfig().isDoRelTaxa();
213 194
	}
cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsVernacularImport.java
38 38
/**
39 39
 * @author a.mueller
40 40
 * @created 20.02.2010
41
 * @version 1.0
42 41
 */
43 42
@Component
44 43
public class ErmsVernacularImport  extends ErmsImportBase<CommonTaxonName> {
......
57 56
		super(pluralString, dbTableName, cdmTargetClass);
58 57
	}
59 58

  
60

  
61
	/* (non-Javadoc)
62
	 * @see eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportBase#getRecordQuery(eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportConfigurator)
63
	 */
64 59
	@Override
65 60
	protected String getRecordQuery(ErmsImportConfigurator config) {
66 61
		String strRecordQuery = 
......
70 65
		return strRecordQuery;
71 66
	}
72 67

  
73
	/* (non-Javadoc)
74
	 * @see eu.etaxonomy.cdm.io.erms.ErmsImportBase#getMapping()
75
	 */
68
	@Override
76 69
	protected DbImportMapping<ErmsImportState, ErmsImportConfigurator> getMapping() {
77 70
		if (mapping == null){
78 71
			mapping = new DbImportMapping<ErmsImportState, ErmsImportConfigurator>();
......
85 78
		}
86 79
		return mapping;
87 80
	}
81

  
82
	@Override
83
	protected void doInvoke(ErmsImportState state) {
84
		this.state = state;
85
		super.doInvoke(state);
86
	}
88 87
	
89
	/* (non-Javadoc)
90
	 * @see eu.etaxonomy.cdm.io.berlinModel.in.IPartitionedIO#getRelatedObjectsForPartition(java.sql.ResultSet)
91
	 */
92
	public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs) {
88
	@Override
89
	public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs, ErmsImportState state) {
93 90
		String nameSpace;
94 91
		Class<?> cdmClass;
95 92
		Set<String> idSet;
......
144 141
		return result;
145 142
	}
146 143
	
147
	/* (non-Javadoc)
148
	 * @see eu.etaxonomy.cdm.io.common.CdmIoBase#doCheck(eu.etaxonomy.cdm.io.common.IImportConfigurator)
149
	 */
150 144
	@Override
151 145
	protected boolean doCheck(ErmsImportState state){
152 146
		IOValidator<ErmsImportState> validator = new ErmsVernacularImportValidator();
......
154 148
	}
155 149
	
156 150
	
157
	/* (non-Javadoc)
158
	 * @see eu.etaxonomy.cdm.io.common.CdmIoBase#isIgnore(eu.etaxonomy.cdm.io.common.IImportConfigurator)
159
	 */
151
	@Override
160 152
	protected boolean isIgnore(ErmsImportState state){
161 153
		return ! state.getConfig().isDoVernaculars();
162 154
	}
163 155

  
164

  
165
	@Override
166
	protected void doInvoke(ErmsImportState state) {
167
		this.state = state;
168
		super.doInvoke(state);
169
	}
170

  
171

  
172

  
173

  
174

  
175 156
}
cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsVernacularSourcesImport.java
32 32
/**
33 33
 * @author a.mueller
34 34
 * @created 12.03.2010
35
 * @version 1.0
36 35
 */
37 36
@Component
38 37
public class ErmsVernacularSourcesImport extends ErmsImportBase<CommonTaxonName> {
......
43 42
	
44 43
	private static String pluralString = "vernacular sources";
45 44
	private static String dbTableName = "vernaculars_sources";
46
	private static final Class cdmTargetClass = DescriptionElementSource.class;
45
	private static final Class<?> cdmTargetClass = DescriptionElementSource.class;
47 46

  
48
	private DbImportMapping mapping;
47
	private DbImportMapping<?,?> mapping;
49 48
	
50 49
	
51 50
//******************************************* CONSTRUCTOR *******************************	
......
59 58
		super(pluralString, dbTableName, cdmTargetClass);
60 59
	}
61 60

  
62

  
63
	/* (non-Javadoc)
64
	 * @see eu.etaxonomy.cdm.io.erms.ErmsImportBase#getRecordQuery(eu.etaxonomy.cdm.io.erms.ErmsImportConfigurator)
65
	 */
66 61
	@Override
67 62
	protected String getRecordQuery(ErmsImportConfigurator config) {
68 63
		String strQuery = 
......
73 68
		return strQuery;
74 69
	}
75 70

  
76
	/* (non-Javadoc)
77
	 * @see eu.etaxonomy.cdm.io.erms.ErmsImportBase#getIdQuery()
78
	 */
79 71
	@Override
80 72
	protected String getIdQuery() {
81 73
		String strQuery = 
......
85 77
		return strQuery;
86 78
	}
87 79

  
88
	/* (non-Javadoc)
89
	 * @see eu.etaxonomy.cdm.io.erms.ErmsImportBase#getMapping()
90
	 */
91
	protected DbImportMapping getMapping() {
80
	@Override
81
	protected DbImportMapping<?,?> getMapping() {
92 82
		if (mapping == null){
93 83
			mapping = new DbImportMapping();
94 84
			String vernacularNamespace = ErmsVernacularImport.VERNACULAR_NAMESPACE;
......
97 87
		}
98 88
		return mapping;
99 89
	}
100

  
101
	/* (non-Javadoc)
102
	 * @see eu.etaxonomy.cdm.io.common.IPartitionedIO#getRelatedObjectsForPartition(java.sql.ResultSet)
103
	 */
104
	public Map getRelatedObjectsForPartition(ResultSet rs) {
90
	
91
	@Override
92
	public Map getRelatedObjectsForPartition(ResultSet rs, ErmsImportState state) {
105 93
		String nameSpace;
106
		Class cdmClass;
94
		Class<?> cdmClass;
107 95
		Set<String> idSet;
108 96
		Map<Object, Map<String, ? extends CdmBase>> result = new HashMap<Object, Map<String, ? extends CdmBase>>();
109 97
		
......
137 125
	}
138 126
	
139 127

  
140
	/* (non-Javadoc)
141
	 * @see eu.etaxonomy.cdm.io.common.CdmIoBase#doCheck(eu.etaxonomy.cdm.io.common.IoStateBase)
142
	 */
143 128
	@Override
144 129
	protected boolean doCheck(ErmsImportState state) {
145 130
		IOValidator<ErmsImportState> validator = new ErmsVernacularSourceImportValidator();
146 131
		return validator.validate(state);
147 132
	}
148 133
	
149
	
150
	/* (non-Javadoc)
151
	 * @see eu.etaxonomy.cdm.io.common.CdmIoBase#isIgnore(eu.etaxonomy.cdm.io.common.IoStateBase)
152
	 */
153 134
	@Override
154 135
	protected boolean isIgnore(ErmsImportState state) {
155 136
		boolean isDo = state.getConfig().isDoVernaculars() && state.getConfig().isDoVernaculars();
cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/validation/ErmsGeneralImportValidator.java
157 157
	/* (non-Javadoc)
158 158
	 * @see eu.etaxonomy.cdm.io.berlinModel.in.IPartitionedIO#getRelatedObjectsForPartition(java.sql.ResultSet)
159 159
	 */
160
	public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs) {
160
	public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs, ErmsImportState state) {
161 161
		return null;  // not needed
162 162
	}
163 163

  
cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/indexFungorum/IndexFungorumDistributionImport.java
146 146
		return taxon;
147 147
	}
148 148

  
149
	/* (non-Javadoc)
150
	 * @see eu.etaxonomy.cdm.io.berlinModel.in.IPartitionedIO#getRelatedObjectsForPartition(java.sql.ResultSet)
151
	 */
152
	public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs) {
149

  
150
	@Override
151
	public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs, IndexFungorumImportState state) {
153 152
		String nameSpace;
154
		Class cdmClass;
153
		Class<?> cdmClass;
155 154
		Set<String> idSet;
156 155
		Map<Object, Map<String, ? extends CdmBase>> result = new HashMap<Object, Map<String, ? extends CdmBase>>();
157 156
		
......
181 180
	}
182 181
	
183 182

  
184

  
185
	/* (non-Javadoc)
186
	 * @see eu.etaxonomy.cdm.io.common.CdmIoBase#doCheck(eu.etaxonomy.cdm.io.common.IImportConfigurator)
187
	 */
188 183
	@Override
189 184
	protected boolean doCheck(IndexFungorumImportState state){
190 185
		return true;
191 186
	}
192 187
	
193
	/* (non-Javadoc)
194
	 * @see eu.etaxonomy.cdm.io.common.CdmIoBase#isIgnore(eu.etaxonomy.cdm.io.common.IImportConfigurator)
195
	 */
188
	@Override
196 189
	protected boolean isIgnore(IndexFungorumImportState state){
197 190
		return ! state.getConfig().isDoOccurrence();
198 191
	}
cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/indexFungorum/IndexFungorumGeneraImport.java
155 155
		return parentName;
156 156
	}
157 157

  
158
	/* (non-Javadoc)
159
	 * @see eu.etaxonomy.cdm.io.berlinModel.in.IPartitionedIO#getRelatedObjectsForPartition(java.sql.ResultSet)
160
	 */
161
	public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs) {
158

  
159
	@Override
160
	public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs, IndexFungorumImportState state) {
162 161
		String nameSpace;
163
		Class cdmClass;
162
		Class<?> cdmClass;
164 163
		Set<String> idSet;
165 164
		Map<Object, Map<String, ? extends CdmBase>> result = new HashMap<Object, Map<String, ? extends CdmBase>>();
166 165
		
......
194 193
	}
195 194
	
196 195

  
197

  
198
	/* (non-Javadoc)
199
	 * @see eu.etaxonomy.cdm.io.common.CdmIoBase#doCheck(eu.etaxonomy.cdm.io.common.IImportConfigurator)
200
	 */
201 196
	@Override
202 197
	protected boolean doCheck(IndexFungorumImportState state){
203 198
		return true;
204 199
	}
205 200
	
206
	/* (non-Javadoc)
207
	 * @see eu.etaxonomy.cdm.io.common.CdmIoBase#isIgnore(eu.etaxonomy.cdm.io.common.IImportConfigurator)
208
	 */
201
	@Override
209 202
	protected boolean isIgnore(IndexFungorumImportState state){
210 203
		return ! state.getConfig().isDoTaxa();
211 204
	}
cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/indexFungorum/IndexFungorumHigherClassificationImport.java
49 49
	}
50 50

  
51 51

  
52
	/* (non-Javadoc)
53
	 * @see eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportBase#getRecordQuery(eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportConfigurator)
54
	 */
55 52
	@Override
56 53
	protected String getRecordQuery(IndexFungorumImportConfigurator config) {
57 54
		String strRecordQuery = 
......
99 96
		
100 97
		TransactionStatus tx = startTransaction();
101 98
		ResultSet rsRelatedObjects = state.getConfig().getSource().getResultSet(sql);
102
		state.setRelatedObjects((Map)getRelatedObjectsForPartition(rsRelatedObjects));
99
		state.setRelatedObjects((Map)getRelatedObjectsForPartition(rsRelatedObjects, state));
103 100
		
104 101
		Classification classification = getClassification(state);
105 102
		
......
257 254
	}
258 255

  
259 256

  
260
	/* (non-Javadoc)
261
	 * @see eu.etaxonomy.cdm.io.berlinModel.in.IPartitionedIO#getRelatedObjectsForPartition(java.sql.ResultSet)
262
	 */
263
	public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs) {
257
	@Override
258
	public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs, IndexFungorumImportState state) {
264 259
		String nameSpace;
265
		Class cdmClass;
260
		Class<?> cdmClass;
266 261
		Set<String> idSet;
267 262
		Map<Object, Map<String, ? extends CdmBase>> result = new HashMap<Object, Map<String, ? extends CdmBase>>();
268 263
		
......
295 290
		return result;
296 291
	}
297 292
	
298

  
299

  
300
	/* (non-Javadoc)
301
	 * @see eu.etaxonomy.cdm.io.common.CdmIoBase#doCheck(eu.etaxonomy.cdm.io.common.IImportConfigurator)
302
	 */
303 293
	@Override
304 294
	protected boolean doCheck(IndexFungorumImportState state){
305 295
		return true;
306 296
	}
307 297
	
308
	/* (non-Javadoc)
309
	 * @see eu.etaxonomy.cdm.io.common.CdmIoBase#isIgnore(eu.etaxonomy.cdm.io.common.IImportConfigurator)
310
	 */
298
	@Override
311 299
	protected boolean isIgnore(IndexFungorumImportState state){
312 300
		return ! state.getConfig().isDoRelTaxa();
313 301
	}
cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/indexFungorum/IndexFungorumSpeciesImport.java
145 145
		return taxon;
146 146
	}
147 147

  
148
	/* (non-Javadoc)
149
	 * @see eu.etaxonomy.cdm.io.berlinModel.in.IPartitionedIO#getRelatedObjectsForPartition(java.sql.ResultSet)
150
	 */
151
	public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs) {
148

  
149
	@Override
150
	public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs, IndexFungorumImportState state) {
152 151
		String nameSpace;
153
		Class cdmClass;
152
		Class<?> cdmClass;
154 153
		Set<String> idSet;
155 154
		Map<Object, Map<String, ? extends CdmBase>> result = new HashMap<Object, Map<String, ? extends CdmBase>>();
156 155
		
......
179 178
		return result;
180 179
	}
181 180
	
182

  
183

  
184
	/* (non-Javadoc)
185
	 * @see eu.etaxonomy.cdm.io.common.CdmIoBase#doCheck(eu.etaxonomy.cdm.io.common.IImportConfigurator)
186
	 */
187 181
	@Override
188 182
	protected boolean doCheck(IndexFungorumImportState state){
189 183
		return true;
190 184
	}
191 185
	
192
	/* (non-Javadoc)
193
	 * @see eu.etaxonomy.cdm.io.common.CdmIoBase#isIgnore(eu.etaxonomy.cdm.io.common.IImportConfigurator)
194
	 */
186
	@Override
195 187
	protected boolean isIgnore(IndexFungorumImportState state){
196 188
		return ! state.getConfig().isDoTaxa();
197 189
	}
cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/indexFungorum/IndexFungorumSupraGeneraImport.java
43 43
	}
44 44

  
45 45

  
46
	/* (non-Javadoc)
47
	 * @see eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportBase#getRecordQuery(eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportConfigurator)
48
	 */
49 46
	@Override
50 47
	protected String getRecordQuery(IndexFungorumImportConfigurator config) {
51 48
		String strRecordQuery = 
......
71 68
		
72 69
		//transaction and related objects
73 70
		TransactionStatus tx = startTransaction();
74
		state.setRelatedObjects((Map)getRelatedObjectsForPartition(null));
71
		state.setRelatedObjects((Map)getRelatedObjectsForPartition(null, state));
75 72
		sourceReference = state.getRelatedObject(NAMESPACE_REFERENCE, SOURCE_REFERENCE, Reference.class);
76 73
		
77 74
		try {
......
124 121
	}
125 122

  
126 123

  
127
	/* (non-Javadoc)
128
	 * @see eu.etaxonomy.cdm.io.berlinModel.in.IPartitionedIO#getRelatedObjectsForPartition(java.sql.ResultSet)
129
	 */
130
	public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs) {
124
	@Override
125
	public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs, IndexFungorumImportState state) {
131 126
		HashMap<Object, Map<String, ? extends CdmBase>> result = new HashMap<Object, Map<String,? extends CdmBase>>();  //not needed here
132 127
		
133 128
		//sourceReference
......
139 134
		return result;
140 135
	}
141 136
	
142

  
143

  
144
	/* (non-Javadoc)
145
	 * @see eu.etaxonomy.cdm.io.common.CdmIoBase#doCheck(eu.etaxonomy.cdm.io.common.IImportConfigurator)
146
	 */
147 137
	@Override
148 138
	protected boolean doCheck(IndexFungorumImportState state){
149 139
		return true;
150 140
	}
151 141
	
152
	/* (non-Javadoc)
153
	 * @see eu.etaxonomy.cdm.io.common.CdmIoBase#isIgnore(eu.etaxonomy.cdm.io.common.IImportConfigurator)
154
	 */
142
	@Override
155 143
	protected boolean isIgnore(IndexFungorumImportState state){
156 144
		return ! state.getConfig().isDoTaxa();
157 145
	}

Also available in: Unified diff