From 52844f2bf9e267ce78d21a9dfd8db1dcfd1b9c56 Mon Sep 17 00:00:00 2001 From: Nunzio Andrea Galante Date: Fri, 7 Apr 2017 13:56:40 +0000 Subject: [PATCH] git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/dataminer-pool-manager@146689 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../poolmanager/rest/RestPoolManager.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/rest/RestPoolManager.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/rest/RestPoolManager.java index 2cd8bcc..3210411 100644 --- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/rest/RestPoolManager.java +++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/rest/RestPoolManager.java @@ -193,7 +193,8 @@ public class RestPoolManager implements PoolManager { @QueryParam("category") String category, @DefaultValue("transducerers") @QueryParam("algorithmType") String algorithmType, @DefaultValue("N") @QueryParam("skipJava") String skipJava, - @DefaultValue("false") @QueryParam("publish") boolean publish) + @DefaultValue("false") @QueryParam("publish") boolean publish, + @DefaultValue("false") @QueryParam("updateSVN") boolean updateSVN) throws IOException, InterruptedException, SVNException { Algorithm algo = this.getAlgorithm(algorithm, /*vre*/null, null, name, description, category, algorithmType, skipJava); @@ -201,8 +202,8 @@ public class RestPoolManager implements PoolManager { if (publish) { service.addAlgToIs(algo); ***REMOVED*** - ***REMOVED*** update svn + if (updateSVN){ for (Dependency d : algo.getDependencies()) { if (d.getType().equals("os")) { @@ -220,6 +221,7 @@ public class RestPoolManager implements PoolManager { ls.add(d.getName()); service.updateSVN("r_github_pkgs.txt", ls); ***REMOVED*** + ***REMOVED*** ***REMOVED*** return service.addAlgorithmToVRE(algo, ScopeProvider.instance.get()); @@ -236,16 +238,19 @@ public class RestPoolManager implements PoolManager { @QueryParam("category") String category, @DefaultValue("transducerers") @QueryParam("algorithmType") String algorithmType, @DefaultValue("N") @QueryParam("skipJava") String skipJava, - @DefaultValue("false") @QueryParam("publish") boolean publish) + @DefaultValue("false") @QueryParam("publish") boolean publish, + @DefaultValue("false") @QueryParam("updateSVN") boolean updateSVN) throws IOException, InterruptedException, SVNException { Algorithm algo = this.getAlgorithm(algorithm, null, hostname, name, description, category, algorithmType, skipJava); ***REMOVED*** publish algo + if (publish) { service.addAlgToIs(algo); ***REMOVED*** ***REMOVED*** update svn + if (updateSVN){ for (Dependency d : algo.getDependencies()) { if (d.getType().equals("os")) { @@ -263,6 +268,7 @@ public class RestPoolManager implements PoolManager { ls.add(d.getName()); service.updateSVN("r_github_pkgs.txt", ls); ***REMOVED*** + ***REMOVED*** ***REMOVED*** return service.addAlgorithmToHost(algo, hostname); ***REMOVED*** @@ -332,7 +338,7 @@ public class RestPoolManager implements PoolManager { a.addAlgorithmToVRE( "http:***REMOVED***data.d4science.org/TVc0TW9Ud1FjYlppK0NHd2pvU0owNmRFWHE4OW4xSGNHbWJQNStIS0N6Yz0", "test", - null, null, "N", "transducerers", false); + null, null, "N", "transducerers", true, false); ***REMOVED*** a.addAlgorithmToHost( ***REMOVED*** "http:***REMOVED***data.d4science.org/dENQTTMxdjNZcGRpK0NHd2pvU0owMFFzN0VWemw3Zy9HbWJQNStIS0N6Yz0", @@ -392,7 +398,6 @@ public class RestPoolManager implements PoolManager { return null; ***REMOVED*** - @Override public List updateSVN(String file, List ldep) throws SVNException {