Project

General

Profile

« Previous | Next » 

Revision c5d04eba

Added by Andreas Müller over 2 years ago

cleanup

View differences:

app-import/src/main/java/eu/etaxonomy/cdm/io/bogota/BogotaChecklistTaxonImport.java
23 23
import eu.etaxonomy.cdm.model.common.Language;
24 24
import eu.etaxonomy.cdm.model.name.IBotanicalName;
25 25
import eu.etaxonomy.cdm.model.name.Rank;
26
import eu.etaxonomy.cdm.model.name.TaxonName;
26 27
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
27 28
import eu.etaxonomy.cdm.model.reference.Reference;
28 29
import eu.etaxonomy.cdm.model.taxon.Classification;
......
167 168
        }else{
168 169
            nameStr = nameStr.replace(auctStr, "").trim();
169 170
        }
170
        IBotanicalName name = (IBotanicalName)parser.parseFullName(nameStr, state.getConfig().getNomenclaturalCode(), rank);
171
        TaxonName name = (TaxonName)parser.parseFullName(nameStr, state.getConfig().getNomenclaturalCode(), rank);
171 172
        name.addImportSource(noStr, getNamespace(state.getConfig()), getSourceCitation(state), null);
172 173
        name = state.getDeduplicationHelper().getExistingName(name);
173 174
        if (name.isProtectedTitleCache()){
......
184 185
        taxon.addMisappliedName(misApp, state.getConfig().getSecReference(), null);
185 186
    }
186 187

  
187

  
188
    /**
189
     * @param col
190
     * @return
191
     */
192 188
    private String getNamespace(CONFIG config) {
193 189
        return getWorksheetName(config)+"."+ ID_COL;
194 190
    }
195 191

  
196

  
197
    /**
198
     * @param state
199
     * @param record
200
     * @param line
201
     * @param taxon
202
     * @param noStr
203
     */
204 192
    private void handleSingleSynonym(SimpleExcelTaxonImportState<CONFIG> state, String nameStr,
205 193
            String line, Taxon taxon, String noStr) {
206 194
        Rank rank = Rank.SPECIES();
207
        IBotanicalName name = (IBotanicalName)parser.parseFullName(nameStr, state.getConfig().getNomenclaturalCode(), rank);
195
        TaxonName name = (TaxonName)parser.parseFullName(nameStr, state.getConfig().getNomenclaturalCode(), rank);
208 196
        name.addImportSource(noStr, getNamespace(state.getConfig()), getSourceCitation(state), null);
209 197
        name = state.getDeduplicationHelper().getExistingName(name);
210 198
        if (name.isProtectedTitleCache()){
......
217 205
        taxon.addSynonym(synonym, SynonymType.SYNONYM_OF());
218 206
    }
219 207

  
220

  
221
    /**
222
     * @param state
223
     * @param line
224
     * @param record
225
     * @param taxon
226
     * @param noStr
227
     */
228 208
    private void makeInfraSpecific(SimpleExcelTaxonImportState<CONFIG> state, Map<String, String> record, String line,
229 209
            TaxonNode speciesNode, String noStr) {
230 210
        String subSpeciesStr = getValue(record, INFRASPECIFIC);
......
235 215
                    split = split.replace(" None", "").trim();
236 216
                }
237 217
                Rank rank = Rank.SUBSPECIES();
238
                IBotanicalName name = (IBotanicalName)parser.parseFullName(split.trim(), state.getConfig().getNomenclaturalCode(), rank);
218
                TaxonName name = (TaxonName)parser.parseFullName(split.trim(), state.getConfig().getNomenclaturalCode(), rank);
239 219
                name.addImportSource(noStr, getNamespace(state.getConfig()), getSourceCitation(state), null);
240 220
                name = state.getDeduplicationHelper().getExistingName(name);
241 221
                if (name.isProtectedTitleCache()){
......
251 231
        }
252 232
    }
253 233

  
254
    /**
255
     * @param state
256
     * @param line
257
     * @param record
258
     * @param noStr
259
     * @return
260
     */
261 234
    private TaxonNode makeTaxon(SimpleExcelTaxonImportState<CONFIG> state, String line, Map<String, String> record,
262 235
            String noStr) {
263 236

  
......
272 245

  
273 246
        nameStr = CdmUtils.concat(" ", nameStr, speciesAuthorStr);
274 247
        Rank rank = Rank.SPECIES();
275
        IBotanicalName name = (IBotanicalName)parser.parseFullName(nameStr, state.getConfig().getNomenclaturalCode(), rank);
248
        TaxonName name = (TaxonName)parser.parseFullName(nameStr, state.getConfig().getNomenclaturalCode(), rank);
276 249
        name.addImportSource(noStr, getNamespace(state.getConfig()), getSourceCitation(state), null);
277 250
        name = state.getDeduplicationHelper().getExistingName(name);
278 251
        if (name.isProtectedTitleCache()){

Also available in: Unified diff