From c7e1990b194b7896ee9139ebf7a9cd9d575b425d Mon Sep 17 00:00:00 2001
From: "fabio.sinibaldi" <fabio.sinibaldi@isti.cnr.it>
Date: Wed, 19 Jun 2019 13:16:04 +0000
Subject: [PATCH] Fixed input parameters retrieval and CKAN translation

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/data-publishing/gCat-Feeder-Suite@179910 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .../dm/DMAlgorithmsInfoCollector.java           | 17 +++++++++++++++--
 .../dm/model/InternalAlgorithmDescriptor.java   |  3 ++-
 .../collectors/dm/model/ckan/CkanItem.java      |  1 +
 .../collectors/dm/model/ckan/GCatModel.java     | 16 ++++++++++++----
 .../gCatFeeder/collectors/dm/profile.xml        |  8 +-------
 5 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/DMAlgorithmsInfoCollector.java b/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/DMAlgorithmsInfoCollector.java
index 6abd803..de7d061 100644
--- a/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/DMAlgorithmsInfoCollector.java
+++ b/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/DMAlgorithmsInfoCollector.java
@@ -99,14 +99,27 @@ public class DMAlgorithmsInfoCollector implements DataCollector<InternalAlgorith
 					desc.setAuthor(parseUser(getAuthor(opDescription)));
 					desc.setMaintainer(parseUser(getAuthor(opDescription)));
 					
+					
+					
 					// Parameters info
-					for(org.gcube.data.analysis.dataminermanagercl.shared.parameters.Parameter param:op.getOperatorParameters()) {
+					for(org.gcube.data.analysis.dataminermanagercl.shared.parameters.Parameter param:client.getInputParameters(op)) {
 						String paramDescription=param.getDescription();
 						String paramName=param.getName();
 						String paramType=param.getTypology().toString();
 						String paramValue=param.getValue();
 						
-						desc.getParameters().add(
+						desc.getInputParameters().add(
+								new Parameter(paramName, paramType, paramDescription, paramValue));
+						
+					}
+					
+					for(org.gcube.data.analysis.dataminermanagercl.shared.parameters.Parameter param:client.getOutputParameters(op)) {
+						String paramDescription=param.getDescription();
+						String paramName=param.getName();
+						String paramType=param.getTypology().toString();
+						String paramValue=param.getValue();
+						
+						desc.getOutputParameters().add(
 								new Parameter(paramName, paramType, paramDescription, paramValue));
 						
 					}
diff --git a/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/model/InternalAlgorithmDescriptor.java b/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/model/InternalAlgorithmDescriptor.java
index 34fe352..16956c0 100644
--- a/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/model/InternalAlgorithmDescriptor.java
+++ b/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/model/InternalAlgorithmDescriptor.java
@@ -34,7 +34,8 @@ public class InternalAlgorithmDescriptor implements CustomData {
 	private String categoryName;
 	
 	
-	private Set<Parameter> parameters=new HashSet<>();
+	private Set<Parameter> inputParameters=new HashSet<>();
+	private Set<Parameter> outputParameters=new HashSet<>();
 	
 	private String guiLink;
 	private String wpsLink;
diff --git a/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/model/ckan/CkanItem.java b/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/model/ckan/CkanItem.java
index dfa2425..f5ec976 100644
--- a/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/model/ckan/CkanItem.java
+++ b/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/model/ckan/CkanItem.java
@@ -38,6 +38,7 @@ public class CkanItem {
 	private String license_id;
 	private String author;
 	private String maintainer;
+	private String notes;
 	private ArrayList<Tag> tags=new ArrayList<Tag>();
 
 	private ArrayList<CKanExtraField> extras=new ArrayList<>();
diff --git a/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/model/ckan/GCatModel.java b/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/model/ckan/GCatModel.java
index a967a8b..77a0f4f 100644
--- a/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/model/ckan/GCatModel.java
+++ b/DataMinerAlgorithmsCrawler/src/main/java/org/gcube/data/publishing/gCatFeeder/collectors/dm/model/ckan/GCatModel.java
@@ -50,8 +50,15 @@ public class GCatModel implements CatalogueFormatData {
 		
 		item.setPrivateFlag(desc.getPrivateFlag());
 		
-		// TODO ADD PARAMETERS
-		for(Parameter param: desc.getParameters())
+		for(Parameter param: desc.getInputParameters())
+			item.getExtras().add(new CKanExtraField(profileID+":Input Parameter", 
+					String.format("%1$s [%2$s] %3$s : %4$s", 
+							param.getName(),param.getType(),
+							((param.getValue()!=null&&!param.getValue().isEmpty())?"default : "+param.getValue():""),
+							param.getDescription())));
+		
+		
+		for(Parameter param: desc.getOutputParameters())
 			item.getExtras().add(new CKanExtraField(profileID+":Input Parameter", 
 					String.format("%1$s [%2$s] %3$s : %4$s", 
 							param.getName(),param.getType(),
@@ -60,7 +67,9 @@ public class GCatModel implements CatalogueFormatData {
 		
 		
 		//Algorithm Description
-		item.getExtras().add(new CKanExtraField(profileID+":Process Description", desc.getDescription()));
+//		item.getExtras().add(new CKanExtraField(profileID+":Process Description", desc.getDescription()));
+		
+		item.setNotes(desc.getDescription());
 		
 		
 		// Algorithm Users
@@ -68,7 +77,6 @@ public class GCatModel implements CatalogueFormatData {
 		item.getExtras().add(new CKanExtraField(profileID+":Process Author",desc.getAuthor().asStringValue()));
 		item.getExtras().add(new CKanExtraField(profileID+":Process Maintainer",desc.getAuthor().asStringValue()));
 		
-		// TODO ADD RESOURCES
 		if(desc.getGuiLink()!=null) 
 			resources.add(new CkanResource("Gateway Link",desc.getGuiLink(),"HTTP","Link to the GUI designed to operate with DataMiner"));
 		if(desc.getWpsLink()!=null)
diff --git a/DataMinerAlgorithmsCrawler/src/main/resources/org/gcube/data/publishing/gCatFeeder/collectors/dm/profile.xml b/DataMinerAlgorithmsCrawler/src/main/resources/org/gcube/data/publishing/gCatFeeder/collectors/dm/profile.xml
index e4b0417..8ef085e 100644
--- a/DataMinerAlgorithmsCrawler/src/main/resources/org/gcube/data/publishing/gCatFeeder/collectors/dm/profile.xml
+++ b/DataMinerAlgorithmsCrawler/src/main/resources/org/gcube/data/publishing/gCatFeeder/collectors/dm/profile.xml
@@ -4,13 +4,7 @@
 		<mandatory>false</mandatory>
 		<dataType>String</dataType>
 		<note>Input parameter expected for the execution of the process</note>
-	</metadatafield>
-	<metadatafield>
-		<fieldName>Process Description</fieldName>
-		<mandatory>false</mandatory>
-		<dataType>String</dataType>
-		<note>Input parameter expected for the execution of the process</note>
-	</metadatafield>
+	</metadatafield>	
 	<metadatafield>
 		<fieldName>Output Parameter</fieldName>
 		<mandatory>false</mandatory>