diff --git a/src/main/java/org/hbp/mip/controllers/WorkflowApi.java b/src/main/java/org/hbp/mip/controllers/WorkflowApi.java index d08a37af7f182a01f0b1676bbd6458e1f3c72358..afd38e46f9d4776850d644cbb572a94c29ae542c 100644 --- a/src/main/java/org/hbp/mip/controllers/WorkflowApi.java +++ b/src/main/java/org/hbp/mip/controllers/WorkflowApi.java @@ -37,16 +37,13 @@ public class WorkflowApi { if(algo.equals("glr")) { code = sendPost("https://mip.humanbrainproject.eu/services/request", query, results); - if(code != 200){ - return new ResponseEntity<>(HttpStatus.valueOf(code)); - } } else if(algo.equals("anv")) { results.append("not implemented"); } - return ResponseEntity.ok(results.toString()); + return new ResponseEntity<>(results.toString(), HttpStatus.valueOf(code)); } @@ -69,18 +66,22 @@ public class WorkflowApi { int respCode = con.getResponseCode(); - if(respCode == 200) + BufferedReader in = null; + if(respCode == 200) { + in = new BufferedReader(new InputStreamReader(con.getInputStream())); + } + else { - BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream())); - String inputLine; - StringBuilder response = new StringBuilder(); - - while ((inputLine = in.readLine()) != null) { - response.append(inputLine); - } - in.close(); - resp.append(response.toString()); + in = new BufferedReader(new InputStreamReader(con.getErrorStream())); + } + String inputLine; + StringBuilder response = new StringBuilder(); + + while ((inputLine = in.readLine()) != null) { + response.append(inputLine); } + in.close(); + resp.append(response.toString()); return respCode; } diff --git a/src/test/db b/src/test/db index b424b9d34d711dd90abe073a947f5069b211a261..d9f1a5cde43b31469c97c2b5923ce9585685d597 160000 --- a/src/test/db +++ b/src/test/db @@ -1 +1 @@ -Subproject commit b424b9d34d711dd90abe073a947f5069b211a261 +Subproject commit d9f1a5cde43b31469c97c2b5923ce9585685d597