gCubeSystem
/
grsf-publisher-ws
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adding support for "FAO SDG 14.4.1 Questionnaire" source

This commit is contained in:
Luca Frosini 2022-08-31 11:20:24 +02:00
parent dbad160e36
commit c28f0dcd65
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.settings/org.eclipse.core.resources.prefs
View File

@ -1,4 +1,5 @@
eclipse.preferences.version=1 eclipse.preferences.version=1
encoding//src/main/java=UTF-8 encoding//src/main/java=UTF-8
encoding//src/main/resources=UTF-8
encoding//src/test/java=UTF-8 encoding//src/test/java=UTF-8
encoding/<project>=UTF-8 encoding/<project>=UTF-8

2
src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherFisheryService.java
View File

@ -51,7 +51,7 @@ import eu.trentorise.opendata.jackan.model.CkanDataset;
* @author Costantino Perciante (ISTI - CNR) * @author Costantino Perciante (ISTI - CNR)
* @author Luca Frosini (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 { public class GrsfPublisherFisheryService {
// the context // the context

2
src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherStockService.java
View File

@ -51,7 +51,7 @@ import eu.trentorise.opendata.jackan.model.CkanDataset;
* @author Costantino Perciante (ISTI - CNR) * @author Costantino Perciante (ISTI - CNR)
* @author Luca Frosini (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 { public class GrsfPublisherStockService {
// the context // the context

9
src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/CommonServiceUtils.java
View File

@ -4,7 +4,6 @@ import java.beans.PropertyDescriptor;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
@ -266,7 +265,7 @@ public class CommonServiceUtils {
if(match) { if(match) {
StringBuffer stringBuffer = new StringBuffer(); StringBuffer stringBuffer = new StringBuffer();
if(prependSource) { if(prependSource) {
stringBuffer.append(source.toString()); stringBuffer.append(source.getURLPath());
stringBuffer.append(" "); stringBuffer.append(" ");
} }
if(groupNameOverValue.isEmpty()) { 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) { private static void addRecordToGroups(Set<String> groups, Set<String> sourcesList, Product_Type productType, Sources sourceInPath) {
if(sourceInPath == Sources.GRSF) { 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 { }else {
groups.add(getGroupId(Constants.SYSTEM_TYPE_LEGACY_RECORD)); // i.e. legacy_group groups.add(getGroupId(Constants.SYSTEM_TYPE_LEGACY_RECORD)); // i.e. legacy_group
} }
@ -543,7 +542,7 @@ public class CommonServiceUtils {
if(databaseSources!=null) { if(databaseSources!=null) {
for(Resource<Sources> source : databaseSources) { for(Resource<Sources> source : databaseSources) {
Sources sourceName = source.getName(); 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; return Constants.GRSF_PRE_ORGANIZATION_NAME;
} }
}else }else
return sourceInPath.getOrigName().toLowerCase(); return sourceInPath.getURLPath();
} }
} }