Project

General

Profile

« Previous | Next » 

Revision eeba57bc

Added by Andreas Müller over 10 years ago

fix WebMarker import for BerlinModel

View differences:

app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelWebMarkerImport.java
49 49
		super(dbTableName, pluralString);
50 50
	}
51 51
	
52
	
53
	/* (non-Javadoc)
54
	 * @see eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportBase#getIdQuery()
55
	 */
56 52
	@Override
57 53
	protected String getIdQuery(BerlinModelImportState state) {
58 54
		String result = " SELECT markerId FROM " + getTableName();
......
62 58
		return result;
63 59
	}
64 60

  
65
	/* (non-Javadoc)
66
	 * @see eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportBase#getRecordQuery(eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportConfigurator)
67
	 */
68 61
	@Override
69 62
	protected String getRecordQuery(BerlinModelImportConfigurator config) {
70 63
		String strQuery = 
......
72 65
            " FROM webMarker INNER JOIN webTableName ON webMarker.TableNameFk = webTableName.TableNameId " +
73 66
            " WHERE (markerId IN ("+ ID_LIST_TOKEN + ") )";
74 67
		return strQuery;
75

  
76 68
	}
77 69

  
78
	/* (non-Javadoc)
79
	 * @see eu.etaxonomy.cdm.io.berlinModel.in.IPartitionedIO#doPartition(eu.etaxonomy.cdm.io.berlinModel.in.ResultSetPartitioner, eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportState)
80
	 */
70
	@Override
81 71
	public boolean doPartition(ResultSetPartitioner partitioner, BerlinModelImportState state) {
82 72
		boolean success = true ;
83 73
	
84
		MapWrapper<Taxon> taxonMap = (MapWrapper<Taxon>)state.getStore(ICdmIO.TAXON_STORE);
74
		Map<String, TaxonBase> taxonMap = (Map<String, TaxonBase>) partitioner.getObjectMap(BerlinModelTaxonImport.NAMESPACE);
85 75
		Set<TaxonBase> taxaToBeSaved = new HashSet<TaxonBase>(); 
86 76
		
87 77
		Map<String, DefinedTermBase> definedTermMap = state.getDbCdmDefinedTermMap();
......
132 122
		return success;
133 123
	}
134 124
		
135

  
136
	/* (non-Javadoc)
137
	 * @see eu.etaxonomy.cdm.io.berlinModel.in.IPartitionedIO#getRelatedObjectsForPartition(java.sql.ResultSet)
138
	 */
125
	@Override
139 126
	public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs) {
140 127
		String nameSpace;
141
		Class cdmClass;
128
		Class<?> cdmClass;
142 129
		Set<String> idSet;
143 130
		Map<Object, Map<String, ? extends CdmBase>> result = new HashMap<Object, Map<String, ? extends CdmBase>>();
144 131
		
......
151 138
					logger.warn("A marker is not related to table PTaxon. This case is not handled yet!");
152 139
				}else{
153 140
					handleForeignKey(rs, taxonIdSet, "RIdentifierFk");
154
	}
141
				}
155 142
			}
156 143
	
157 144
			//taxon map
......
167 154
		return result;
168 155
	}
169 156

  
170
	
171 157
	private boolean addMarker(AnnotatableEntity annotatableEntity, boolean activeFlag, int markerCategoryFk, Map<String, DefinedTermBase> map ){
172 158
		MarkerType markerType = (MarkerType)map.get("webMarkerCategory_" + markerCategoryFk);
173 159
		if (markerType == null){
......
179 165

  
180 166
	}
181 167
	
182
	
183
	/* (non-Javadoc)
184
	 * @see eu.etaxonomy.cdm.io.common.CdmIoBase#doCheck(eu.etaxonomy.cdm.io.common.IoStateBase)
185
	 */
186 168
	@Override
187 169
	protected boolean doCheck(BerlinModelImportState state){
188 170
		IOValidator<BerlinModelImportState> validator = new BerlinModelWebMarkerImportValidator();
189 171
		return validator.validate(state);
190 172
	}
191 173
	
192
	
193
	/* (non-Javadoc)
194
	 * @see eu.etaxonomy.cdm.io.common.CdmIoBase#isIgnore(eu.etaxonomy.cdm.io.common.IImportConfigurator)
195
	 */
174
	@Override
196 175
	protected boolean isIgnore(BerlinModelImportState state){
197 176
		return ! state.getConfig().isDoMarker();
198 177
	}
199

  
200

  
201 178
}

Also available in: Unified diff