From 56f905c3c79172d1c84a1e55d6da78923fff71e9 Mon Sep 17 00:00:00 2001 From: Costantino Perciante Date: Thu, 8 Dec 2016 17:32:44 +0000 Subject: [PATCH] Updated exploitation rate/abundance level vocabularies git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@139814 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../grsf_publish_ws/utils/groups/Abundance_Level.java | 4 +++- .../grsf_publish_ws/utils/groups/Exploitation_Rate.java | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/groups/Abundance_Level.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/groups/Abundance_Level.java index 8d1c984..69de38b 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/groups/Abundance_Level.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/groups/Abundance_Level.java @@ -11,7 +11,9 @@ public enum Abundance_Level { Intermediate_Abundance("Intermediate abundance"), Low_Abundance("Low abundance"), - Uncertain_Not_Assessed("Uncertain/Not assessed"); + Uncertain_Not_Assessed("Uncertain/Not assessed"), + Not_applicable("Not applicable"), + Depleted("Depleted"); private String subGroupNameOrig; diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/groups/Exploitation_Rate.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/groups/Exploitation_Rate.java index 23d335d..7a3b763 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/groups/Exploitation_Rate.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/groups/Exploitation_Rate.java @@ -8,9 +8,11 @@ import com.fasterxml.jackson.annotation.JsonCreator; */ public enum Exploitation_Rate { + Not_Applicable("Not applicable"), Moderate_Fishing_Mortality("Moderate fishing mortality"), High_Fishing_Mortality("High fishing mortality"), - No_Or_Low_Fishing_Mortality("No or low fishing mortality"); + No_Or_Low_Fishing_Mortality("No or low fishing mortality"), + Uncertain_Not_assessed("Uncertain/Not assessed"); private String subGroupNameOrig; private String subGroupNameOnCkan; @@ -39,7 +41,7 @@ public enum Exploitation_Rate { public static Exploitation_Rate onDeserialize(String exploitationString) { if(exploitationString != null) { for (Exploitation_Rate exploitationValue : Exploitation_Rate.values()) { - if(exploitationValue.getOrigName().equalsIgnoreCase(exploitationString)) + if(exploitationValue.getOrigName().replaceAll("[^A-Za-z]", " ").equalsIgnoreCase(exploitationString.replaceAll("[^A-Za-z]", " "))) return exploitationValue; } }