Merge branch 'master' of https://github.com/HPI-Information-Systems/M…

…etanome into ExecutionProcess
HPI-Information-Systems · Apr 10, 2015 · 8a44dc7 · 8a44dc7
2 parents 0390f57 + 059bf47
commit 8a44dc7
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 13 deletions.
diff --git a/backend/src/main/java/de/metanome/backend/resources/AlgorithmExecutionResource.java b/backend/src/main/java/de/metanome/backend/resources/AlgorithmExecutionResource.java
@@ -171,7 +171,7 @@ public Execution executeAlgorithm(AlgorithmExecutionParams params) {
   @GET
   @Path("/result_cache/{identifier}")
   @Produces("application/json")
-  public List<Result> fetchNewResults(@PathParam("identifier") String executionIdentifier) {
+  public List<Result> getCacheResults(@PathParam("identifier") String executionIdentifier) {
     try {
       return AlgorithmExecutionCache.getResultCache(executionIdentifier).fetchNewResults();
     } catch (Exception e) {

diff --git a/backend/src/test/java/de/metanome/backend/resources/AlgorithmExecutionResourceTest.java b/backend/src/test/java/de/metanome/backend/resources/AlgorithmExecutionResourceTest.java
@@ -53,7 +53,7 @@ public void testFetchNewResults() throws Exception {
     AlgorithmExecutionCache.getResultCache(expectedExecutionIdentifier).receiveResult(
         expectedUcc);
     List<Result>
-        actualResult = executionService.fetchNewResults(expectedExecutionIdentifier);
+        actualResult = executionService.getCacheResults(expectedExecutionIdentifier);
 
     // Check result
     assertFalse(actualResult.isEmpty());
@@ -102,7 +102,7 @@ public void testFetchResultsNotPossible() throws FileNotFoundException, Unsuppor
 
     // Check
     List<Result>
-        actualResult = executionService.fetchNewResults(expectedExecutionIdentifier);
+        actualResult = executionService.getCacheResults(expectedExecutionIdentifier);
   }
 
   @Test

diff --git a/frontend/src/main/java/de/metanome/frontend/client/results/ResultsPage.java b/frontend/src/main/java/de/metanome/frontend/client/results/ResultsPage.java
@@ -94,8 +94,10 @@ public void updateOnSuccess(Long executionTimeInMs) {
     this.progressTimer.cancel();
 
     // Fetch the last results or get all results depending on the used result receiver
-    if (cacheResults || writeResults)
-      this.tablePage.fetchResults();
+    if (cacheResults)
+      this.tablePage.fetchCacheResults();
+    else if (writeResults)
+      this.tablePage.fetchPrinterResults();
     else if (countResults)
       this.tablePage.getCounterResults();
 
@@ -164,7 +166,7 @@ public void run() {
     this.progressTimer = new Timer() {
       public void run() {
         if (showProgress) updateProgress();
-        if (cacheResults) resultsTab.fetchResults();
+        if (cacheResults) resultsTab.fetchCacheResults();
       }
     };
     this.progressTimer.scheduleRepeating(10000);

diff --git a/frontend/src/main/java/de/metanome/frontend/client/results/ResultsTablePage.java b/frontend/src/main/java/de/metanome/frontend/client/results/ResultsTablePage.java
@@ -83,11 +83,21 @@ public ResultsTablePage(AlgorithmExecutionRestService executionService, String e
   /**
    * Fetches the results from the execution service and displays them on success.
    */
-  protected void fetchResults() {
+  protected void fetchPrinterResults() {
     if (executionService == null)
       return;
 
-    executionService.fetchNewResults(executionIdentifier, getResultCallback());
+    executionService.getPrinterResults(executionIdentifier, getResultCallback());
+  }
+
+  /**
+   * Fetches the results from the execution service and displays them on success.
+   */
+  protected void fetchCacheResults() {
+    if (executionService == null)
+      return;
+
+    executionService.getCacheResults(executionIdentifier, getResultCallback());
   }
 
   /**
@@ -146,7 +156,7 @@ private MethodCallback<List<Result>> getResultCallback() {
     return new MethodCallback<List<Result>>() {
       @Override
       public void onFailure(Method method, Throwable throwable) {
-        messageReceiver.addError("Could not display all results.");
+        messageReceiver.addError("Could not display all results: " + method.getResponse().getText());
       }
 
       @Override

diff --git a/...end/src/main/java/de/metanome/frontend/client/services/AlgorithmExecutionRestService.java b/...end/src/main/java/de/metanome/frontend/client/services/AlgorithmExecutionRestService.java
@@ -40,14 +40,15 @@ public interface AlgorithmExecutionRestService extends RestService {
   public void executeAlgorithm(AlgorithmExecutionParams params,
                                MethodCallback<Execution> callback);
 
-  @GET
-  @Path("/result_cache/{identifier}")
-  public void fetchNewResults(@PathParam("identifier") String algorithmName, MethodCallback<List<Result>> callback);
-
   @GET
   @Path("/fetch_progress/{identifier}")
   public void fetchProgress(@PathParam("identifier") String executionIdentifier, MethodCallback<Float> callback);
 
+  @GET
+  @Path("/result_cache/{identifier}")
+  public void getCacheResults(@PathParam("identifier") String algorithmName,
+                              MethodCallback<List<Result>> callback);
+
   @GET
   @Path("/result_counter/{identifier}")
   public void getCounterResults(@PathParam("identifier") String executionIdentifier, MethodCallback<Map<ResultType, Integer>> callback);