From c28f0dcd65f3f7378b124ad4a43d51d6d4501ce5 Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Wed, 31 Aug 2022 11:20:24 +0200
Subject: [PATCH] Adding support for "FAO SDG 14.4.1 Questionnaire" source

---
 .settings/org.eclipse.core.resources.prefs               | 1 +
 .../services/GrsfPublisherFisheryService.java            | 2 +-
 .../services/GrsfPublisherStockService.java              | 2 +-
 .../grsf_publish_ws/utils/CommonServiceUtils.java        | 9 ++++-----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
index f9fe345..839d647 100644
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,5 @@
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
 encoding//src/test/java=UTF-8
 encoding/<project>=UTF-8
diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherFisheryService.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherFisheryService.java
index 47cb319..6f18db6 100644
--- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherFisheryService.java
+++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherFisheryService.java
@@ -51,7 +51,7 @@ import eu.trentorise.opendata.jackan.model.CkanDataset;
  * @author Costantino Perciante (ISTI - CNR)
  * @author Luca Frosini (ISTI - CNR)
  */
-@Path("{source:firms|FIRMS|grsf|GRSF|FishSource|fishsource}/fishery/")
+@Path("{source:firms|FIRMS|grsf|GRSF|FishSource|fishsource|sdg14.4.1|SDG14.4.1}/fishery/")
 public class GrsfPublisherFisheryService {
 	
 	// the context
diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherStockService.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherStockService.java
index f6d5850..0b78b47 100644
--- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherStockService.java
+++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherStockService.java
@@ -51,7 +51,7 @@ import eu.trentorise.opendata.jackan.model.CkanDataset;
  * @author Costantino Perciante (ISTI - CNR)
  * @author Luca Frosini (ISTI - CNR)
  */
-@Path("{source:firms|FIRMS|ram|RAM|grsf|GRSF|FishSource|fishsource}/stock/")
+@Path("{source:firms|FIRMS|ram|RAM|grsf|GRSF|FishSource|fishsource|sdg14.4.1|SDG14.4.1}/stock/")
 public class GrsfPublisherStockService {
 	
 	// the context
diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/CommonServiceUtils.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/CommonServiceUtils.java
index 727ebc6..6e10540 100644
--- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/CommonServiceUtils.java
+++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/CommonServiceUtils.java
@@ -4,7 +4,6 @@ import java.beans.PropertyDescriptor;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -266,7 +265,7 @@ public class CommonServiceUtils {
 		if(match) {
 			StringBuffer stringBuffer = new StringBuffer();
 			if(prependSource) {
-				stringBuffer.append(source.toString());
+				stringBuffer.append(source.getURLPath());
 				stringBuffer.append(" ");
 			}
 			if(groupNameOverValue.isEmpty()) {
@@ -289,7 +288,7 @@ public class CommonServiceUtils {
 	 */
 	private static void addRecordToGroups(Set<String> groups, Set<String> sourcesList,  Product_Type productType, Sources sourceInPath) {
 		if(sourceInPath == Sources.GRSF) {
-			groups.add(getGroupId(Sources.GRSF.getOrigName())); // i.e. grsf_group
+			groups.add(getGroupId(Sources.GRSF.getURLPath())); // i.e. grsf_group
 		}else {
 			groups.add(getGroupId(Constants.SYSTEM_TYPE_LEGACY_RECORD)); // i.e. legacy_group
 		}
@@ -543,7 +542,7 @@ public class CommonServiceUtils {
 			if(databaseSources!=null) {
 				for(Resource<Sources> source : databaseSources) {
 					Sources sourceName = source.getName();
-					sourcesList.add(sourceName.getOrigName().toLowerCase());
+					sourcesList.add(sourceName.getURLPath());
 				}
 			}
 		}
@@ -719,6 +718,6 @@ public class CommonServiceUtils {
 				return Constants.GRSF_PRE_ORGANIZATION_NAME;
 			}
 		}else
-			return sourceInPath.getOrigName().toLowerCase();
+			return sourceInPath.getURLPath();
 	}
 }
\ No newline at end of file