gCubeSystem
/
dataminer-pool-manager
15
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/dataminer-pool-manager@144495 82a268e6-3cf1-43bd-a215-b396298e98cf

This commit is contained in:
Nunzio Andrea Galante 2017-03-01 16:39:12 +00:00
parent f058b05035
commit 7f2a804500
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/process/AlgorithmPackageParser.java
View File

@ -173,7 +173,10 @@ public class AlgorithmPackageParser ***REMOVED***
out.setName(extractSingleValue(metadata, METADATA_ALGORITHM_NAME)); out.setName(extractSingleValue(metadata, METADATA_ALGORITHM_NAME));
out.setDescription(extractSingleValue(metadata, METADATA_ALGORITHM_DESCRIPTION)); out.setDescription(extractSingleValue(metadata, METADATA_ALGORITHM_DESCRIPTION));
out.setClazz(extractSingleValue(metadata, METADATA_CLASS_NAME)); out.setClazz(extractSingleValue(metadata, METADATA_CLASS_NAME));
List<String> rdependencies = extractMultipleValues(metadata, "r"); ***REMOVED***List<String> dependencies = extractMultipleValues(metadata, METADATA_PACKAGES);
List<String> rdependencies = extractMultipleValues(metadata, "cran");
if (rdependencies != null) ***REMOVED*** if (rdependencies != null) ***REMOVED***
for (String pkg : rdependencies) ***REMOVED*** for (String pkg : rdependencies) ***REMOVED***
Dependency dep = new Dependency(); Dependency dep = new Dependency();
@ -186,6 +189,18 @@ public class AlgorithmPackageParser ***REMOVED***
***REMOVED*** ***REMOVED***
List<String> 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<String> osdependencies = extractMultipleValues(metadata, "os"); List<String> osdependencies = extractMultipleValues(metadata, "os");
if (osdependencies != null) ***REMOVED*** if (osdependencies != null) ***REMOVED***
for (String pkg : osdependencies) ***REMOVED*** for (String pkg : osdependencies) ***REMOVED***