diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/vocabulary/VocabularyRestController.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/is/vocabulary/VocabularyRestController.java index 54b43f9f..3c25f4d7 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/vocabulary/VocabularyRestController.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/is/vocabulary/VocabularyRestController.java @@ -27,6 +27,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import eu.dnetlib.common.controller.AbstractDnetController; +import eu.dnetlib.is.vocabulary.model.Synonym; import eu.dnetlib.is.vocabulary.model.Vocabulary; import eu.dnetlib.is.vocabulary.model.VocabularyTerm; import eu.dnetlib.is.vocabulary.model.VocabularyTermPK; @@ -98,12 +99,13 @@ public class VocabularyRestController extends AbstractDnetController { term.setVocabulary(vocId); term.setCode(n.valueOf("@code")); term.setName(n.valueOf("@english_name")); + term.setEncoding(n.valueOf("@encoding")); term.setSynonyms(n.selectNodes(".//SYNONYM") .stream() - .map(ns -> ns.valueOf("@term")) + .map(ns -> new Synonym(ns.valueOf("@term"), ns.valueOf("@encoding"))) .sorted() .distinct() - .toArray(String[]::new)); + .toArray(Synonym[]::new)); vocabularyTermRepository.save(term); } diff --git a/apps/dnet-is-application/src/main/resources/static/js/vocabularyEditor.js b/apps/dnet-is-application/src/main/resources/static/js/vocabularyEditor.js index 95622a37..7be7ae9b 100644 --- a/apps/dnet-is-application/src/main/resources/static/js/vocabularyEditor.js +++ b/apps/dnet-is-application/src/main/resources/static/js/vocabularyEditor.js @@ -26,6 +26,7 @@ app.controller('vocabularyController', function($scope, $http, $location) { $scope.tmpTerm = { 'code' : '', 'name' : '', + 'encoding' : 'OPENAIRE', 'synonyms' : [] }; } diff --git a/apps/dnet-is-application/src/main/resources/templates/vocabularies.html b/apps/dnet-is-application/src/main/resources/templates/vocabularies.html index 90919e9b..f727cbc1 100644 --- a/apps/dnet-is-application/src/main/resources/templates/vocabularies.html +++ b/apps/dnet-is-application/src/main/resources/templates/vocabularies.html @@ -89,7 +89,7 @@
diff --git a/apps/dnet-is-application/src/main/resources/templates/vocabularyEditor.html b/apps/dnet-is-application/src/main/resources/templates/vocabularyEditor.html index cdb65bff..1487e66c 100644 --- a/apps/dnet-is-application/src/main/resources/templates/vocabularyEditor.html +++ b/apps/dnet-is-application/src/main/resources/templates/vocabularyEditor.html @@ -49,8 +49,9 @@Code | -Name | +Code | +Name | +Encoding | Synonyms | |||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
{{t.code}} | {{t.name}} | +{{t.encoding}} | 0 synonym(s) - {{s}} + {{s.term}} |
@@ -97,11 +99,51 @@
+
+
+
+
+
+
+
diff --git a/libs/dnet-is-common/src/main/java/eu/dnetlib/is/vocabulary/model/Synonym.java b/libs/dnet-is-common/src/main/java/eu/dnetlib/is/vocabulary/model/Synonym.java
new file mode 100644
index 00000000..28d43e0f
--- /dev/null
+++ b/libs/dnet-is-common/src/main/java/eu/dnetlib/is/vocabulary/model/Synonym.java
@@ -0,0 +1,62 @@
+package eu.dnetlib.is.vocabulary.model;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+import org.apache.commons.lang3.StringUtils;
+
+public class Synonym implements Serializable, Comparable
|