From 7f2a80450027b52b2dbade6df18b1fa94eea1645 Mon Sep 17 00:00:00 2001 From: Nunzio Andrea Galante Date: Wed, 1 Mar 2017 16:39:12 +0000 Subject: [PATCH] git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/dataminer-pool-manager@144495 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../process/AlgorithmPackageParser.java | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/process/AlgorithmPackageParser.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/process/AlgorithmPackageParser.java index dff21c4..6dc4f3f 100644 --- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/process/AlgorithmPackageParser.java +++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/process/AlgorithmPackageParser.java @@ -173,7 +173,10 @@ public class AlgorithmPackageParser ***REMOVED*** out.setName(extractSingleValue(metadata, METADATA_ALGORITHM_NAME)); out.setDescription(extractSingleValue(metadata, METADATA_ALGORITHM_DESCRIPTION)); out.setClazz(extractSingleValue(metadata, METADATA_CLASS_NAME)); - List rdependencies = extractMultipleValues(metadata, "r"); + ***REMOVED***List dependencies = extractMultipleValues(metadata, METADATA_PACKAGES); + + + List rdependencies = extractMultipleValues(metadata, "cran"); if (rdependencies != null) ***REMOVED*** for (String pkg : rdependencies) ***REMOVED*** Dependency dep = new Dependency(); @@ -184,7 +187,19 @@ public class AlgorithmPackageParser ***REMOVED*** out.addDependency(dep); ***REMOVED*** ***REMOVED*** - + + + List defdependencies = extractMultipleValues(metadata, "Packages"); + if (defdependencies != null) ***REMOVED*** + for (String pkg : defdependencies) ***REMOVED*** + Dependency dep = new Dependency(); + + ***REMOVED***if (pkg.startsWith("os:"))***REMOVED*** + dep.setName(pkg); + dep.setType("os"); + out.addDependency(dep); + ***REMOVED*** + ***REMOVED*** List osdependencies = extractMultipleValues(metadata, "os"); if (osdependencies != null) ***REMOVED***