Revision c49dcfa9
Added by Andreas Müller almost 6 years ago
| cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTermBase.java | ||
|---|---|---|
| 395 | 395 |
newInstance.setUuid(UUID.fromString(csvLine.get(0))); |
| 396 | 396 |
newInstance.setUri( URI.create(csvLine.get(1))); |
| 397 | 397 |
String label = csvLine.get(2).trim(); |
| 398 |
String description = csvLine.get(3);
|
|
| 399 |
String abbreviatedLabel = csvLine.get(4);
|
|
| 398 |
String description = CdmUtils.Ne(csvLine.get(3).trim());
|
|
| 399 |
String abbreviatedLabel = CdmUtils.Ne(csvLine.get(4).trim());
|
|
| 400 | 400 |
if (CdmUtils.isBlank(abbreviatedLabel)){
|
| 401 | 401 |
abbreviatedLabel = null; |
| 402 | 402 |
} |
| cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/RelationshipTermBase.java | ||
|---|---|---|
| 39 | 39 |
import org.hibernate.search.annotations.IndexedEmbedded; |
| 40 | 40 |
|
| 41 | 41 |
import au.com.bytecode.opencsv.CSVWriter; |
| 42 |
import eu.etaxonomy.cdm.common.CdmUtils; |
|
| 42 | 43 |
import eu.etaxonomy.cdm.model.description.TextData; |
| 43 | 44 |
import eu.etaxonomy.cdm.model.name.HybridRelationshipType; |
| 44 | 45 |
import eu.etaxonomy.cdm.model.name.NameRelationshipType; |
| ... | ... | |
| 241 | 242 |
public T readCsvLine(Class<T> termClass, List<String> csvLine, Map<UUID,DefinedTermBase> terms, boolean abbrevAsId) {
|
| 242 | 243 |
T newInstance = super.readCsvLine(termClass, csvLine, terms, abbrevAsId); |
| 243 | 244 |
|
| 244 |
String inverseText = csvLine.get(6).trim();
|
|
| 245 |
String inverseText = CdmUtils.Ne(csvLine.get(6).trim());
|
|
| 245 | 246 |
String inverseLabel = csvLine.get(5).trim(); |
| 246 |
String inverseLabelAbbrev = csvLine.get(7).trim();
|
|
| 247 |
String inverseLabelAbbrev = CdmUtils.Ne(csvLine.get(7).trim());
|
|
| 247 | 248 |
newInstance.addInverseRepresentation(new Representation(inverseText, inverseLabel, inverseLabelAbbrev, Language.CSV_LANGUAGE()) ); |
| 248 | 249 |
newInstance.setSymmetric(Boolean.parseBoolean(csvLine.get(8))); |
| 249 | 250 |
newInstance.setTransitive(Boolean.parseBoolean(csvLine.get(9))); |
Also available in: Unified diff
fix empty values in csvLine reading