Revision 61188
Added by Alessia Bardi almost 3 years ago
| modules/dnet-modular-vocabularies-ui/trunk/src/main/java/eu/dnetlib/functionality/modular/ui/vocabularies/model/Term.java | ||
|---|---|---|
| 4 | 4 |
import java.util.List; |
| 5 | 5 |
|
| 6 | 6 |
public class Term implements Comparable<Term> {
|
| 7 |
|
|
| 8 |
public static String DEFAULT_ENCODING = "OPENAIRE"; |
|
| 7 | 9 |
private String englishName; |
| 8 | 10 |
private String nativeName; |
| 9 | 11 |
private String encoding; |
| modules/dnet-modular-vocabularies-ui/trunk/src/main/java/eu/dnetlib/functionality/modular/ui/vocabularies/model/Synonym.java | ||
|---|---|---|
| 1 | 1 |
package eu.dnetlib.functionality.modular.ui.vocabularies.model; |
| 2 | 2 |
|
| 3 | 3 |
public class Synonym implements Comparable<Synonym> {
|
| 4 |
public static String DEFAULT_ENCODING = "OPENAIRE"; |
|
| 5 |
|
|
| 4 | 6 |
private String term; |
| 5 |
private String encoding;
|
|
| 7 |
private String encoding; |
|
| 6 | 8 |
|
| 7 | 9 |
public Synonym() {}
|
| 8 | 10 |
|
| modules/dnet-modular-vocabularies-ui/trunk/src/main/java/eu/dnetlib/functionality/modular/ui/vocabularies/persistence/RegistryServiceVocabularyDAO.java | ||
|---|---|---|
| 17 | 17 |
import org.antlr.stringtemplate.StringTemplate; |
| 18 | 18 |
import org.apache.commons.io.IOUtils; |
| 19 | 19 |
import org.apache.commons.lang.StringEscapeUtils; |
| 20 |
import org.apache.commons.lang.StringUtils; |
|
| 20 | 21 |
import org.dom4j.Document; |
| 21 | 22 |
import org.dom4j.DocumentException; |
| 22 | 23 |
import org.dom4j.Element; |
| ... | ... | |
| 115 | 116 |
// prepare terms for XML |
| 116 | 117 |
for (Term t : terms) {
|
| 117 | 118 |
t.setCode(StringEscapeUtils.escapeXml(t.getCode())); |
| 119 |
if(StringUtils.isBlank(t.getEncoding())) t.setEncoding(Term.DEFAULT_ENCODING); |
|
| 118 | 120 |
t.setEncoding(StringEscapeUtils.escapeXml(t.getEncoding())); |
| 119 | 121 |
t.setEnglishName(StringEscapeUtils.escapeXml(t.getEnglishName())); |
| 120 | 122 |
t.setNativeName(StringEscapeUtils.escapeXml(t.getNativeName())); |
| 121 | 123 |
for (Synonym s : t.getSynonyms()) {
|
| 124 |
if(StringUtils.isBlank(s.getEncoding())) s.setEncoding(Synonym.DEFAULT_ENCODING); |
|
| 122 | 125 |
s.setEncoding(StringEscapeUtils.escapeXml(s.getEncoding())); |
| 123 | 126 |
s.setTerm(StringEscapeUtils.escapeXml(s.getTerm())); |
| 124 | 127 |
} |
Also available in: Unified diff
#6792: set default encoding if user provided a blank one for a term or synonym