diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/others/SimilarRecordBean.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/others/SimilarRecordBean.java index 19f4c61..b4ce4f8 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/others/SimilarRecordBean.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/others/SimilarRecordBean.java @@ -1,6 +1,5 @@ package org.gcube.data_catalogue.grsf_publish_ws.json.input.others; -import org.gcube.data_catalogue.grsf_publish_ws.json.input.record.Common; import org.gcube.datacatalogue.common.Constants; import org.json.simple.JSONObject; @@ -88,7 +87,7 @@ public class SimilarRecordBean { obj.put("description", description); if(id != null && !id.isEmpty()) - obj.put("id", Common.cleanSemanticId(id)); + obj.put("id", id); //Common.cleanSemanticId(id) if(name != null && !name.isEmpty()) obj.put("name", name); diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/Common.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/Common.java index d75ff75..4a0bdf0 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/Common.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/Common.java @@ -332,33 +332,37 @@ public class Common extends Base{ this.annotations = annotations; } - /** - * Clean the semantic id - * @param id - * @return - */ - public static String cleanSemanticId(String id){ - - if(id == null) - return null; - else{ - String idmodified = ""; - if(id != null){ - - String[] splitCodesValues = id.split("\\+"); - for (int i = 0; i < splitCodesValues.length; i++) { - String prefixAndCode = splitCodesValues[i]; - String prefix = prefixAndCode.split(":")[0]; - String code = prefixAndCode.split(":")[1]; - idmodified += prefix.toLowerCase() + ":" + code.toUpperCase(); - if(splitCodesValues.length > 1 && i < (splitCodesValues.length - 1)) - idmodified += "+"; - } - } - return idmodified; - } - - } + // /** + // * Clean the semantic id + // * @param id + // * @return + // */ + // public static String cleanSemanticId(String id){ + // + // if(id == null) + // return null; + // else{ + // String idmodified = ""; + // if(id != null){ + // + // String[] splitCodesValues = id.split("\\+"); + // for (int i = 0; i < splitCodesValues.length; i++) { + // String prefixAndCode = splitCodesValues[i]; + // if(prefixAndCode.length() == 0) + // idmodified += "+"; + // else{ + // String prefix = prefixAndCode.split(":")[0]; + // String code = prefixAndCode.split(":")[1]; + // idmodified += prefix.toLowerCase() + ":" + code.toUpperCase(); + // if(splitCodesValues.length > 1 && i < (splitCodesValues.length - 1)) + // idmodified += "+"; + // } + // } + // } + // return idmodified; + // } + // + // } @Override public String toString() { diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/FisheryRecord.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/FisheryRecord.java index b9ea8c2..0863c73 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/FisheryRecord.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/FisheryRecord.java @@ -108,7 +108,7 @@ public class FisheryRecord extends Common{ } public void setFisheryId(String fisheryId) { - this.fisheryId = super.cleanSemanticId(fisheryId); + this.fisheryId = fisheryId;//super.cleanSemanticId(fisheryId); } public List getFishingArea() { diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/StockRecord.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/StockRecord.java index a764c15..a7af836 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/StockRecord.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/StockRecord.java @@ -173,7 +173,7 @@ public class StockRecord extends Common{ } public void setStockId(String stockId) { - this.stockId = super.cleanSemanticId(stockId); + this.stockId = stockId;//super.cleanSemanticId(stockId); } public List getArea() {