Project

General

Profile

« Previous | Next » 

Revision fac4774f

Added by Patrick Plitzner almost 8 years ago

Import common name #5448

View differences:

app-import/src/main/java/eu/etaxonomy/cdm/io/redlist/gefaesspflanzen/RedListGefaesspflanzenImportNames.java
29 29
import eu.etaxonomy.cdm.model.agent.AgentBase;
30 30
import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
31 31
import eu.etaxonomy.cdm.model.common.CdmBase;
32
import eu.etaxonomy.cdm.model.common.Language;
33
import eu.etaxonomy.cdm.model.description.CommonTaxonName;
34
import eu.etaxonomy.cdm.model.description.TaxonDescription;
32 35
import eu.etaxonomy.cdm.model.name.BotanicalName;
33 36
import eu.etaxonomy.cdm.model.name.NomenclaturalStatus;
34 37
import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;
......
119 122
        String zusatzString = rs.getString(RedListUtil.ZUSATZ);
120 123
        String nonString = rs.getString(RedListUtil.NON);
121 124
        String sensuString = rs.getString(RedListUtil.SENSU);
125
        String trivialString = rs.getString(RedListUtil.TRIVIAL);
122 126
        String authorKombString = rs.getString(RedListUtil.AUTOR_KOMB);
123 127
        String authorBasiString = rs.getString(RedListUtil.AUTOR_BASI);
124 128
        String hybString = rs.getString(RedListUtil.HYB);
......
142 146
                authorBasiString, name);
143 147

  
144 148
        //---TAXON---
145
        TaxonBase taxonBase = importTaxon(id, taxNameString, gueltString, authorBasiString, hybString, name);
149
        TaxonBase taxonBase = importTaxon(id, taxNameString, gueltString, authorBasiString, hybString, trivialString, name);
146 150
        if(taxonBase==null){
147 151
            RedListUtil.logMessage(id, "Taxon for name "+name+" could not be created.", logger);
148 152
            return;
......
213 217
    }
214 218

  
215 219
    private TaxonBase importTaxon(long id, String taxNameString, String gueltString, String authorBasiString,
216
            String hybString, NonViralName name) {
220
            String hybString, String trivialString, NonViralName name) {
217 221
        TaxonBase taxonBase = null;
218 222
        if(authorBasiString.trim().contains(RedListUtil.AUCT)){
219 223
            taxonBase = Taxon.NewInstance(name, null);
......
229 233
            return null;
230 234
        }
231 235

  
236
        //common name
237
        if(taxonBase.isInstanceOf(Taxon.class) && trivialString!=null){
238
            Taxon taxon = HibernateProxyHelper.deproxy(taxonBase, Taxon.class);
239
            TaxonDescription description = TaxonDescription.NewInstance(taxon);
240
            description.addElement(CommonTaxonName.NewInstance(trivialString, Language.getDefaultLanguage()));
241
        }
242

  
232 243
        //check taxon name consistency
233 244
        checkTaxonNameConsistency(id, taxNameString, hybString, taxonBase);
234 245
        return taxonBase;
app-import/src/main/java/eu/etaxonomy/cdm/io/redlist/gefaesspflanzen/RedListUtil.java
89 89
    public static final String TAX_ZUSATZ = "TAX_ZUSATZ";
90 90
    public static final String NON = "NON";
91 91
    public static final String SENSU = "SENSU";
92
    public static final String TRIVIAL = "TRIVIAL";
92 93
    public static final String EPI3 = "EPI3";
93 94
    public static final String EPI2 = "EPI2";
94 95
    public static final String EPI1 = "EPI1";

Also available in: Unified diff