Changeset 1374 for trunk

Timestamp:

03/20/09 12:12:05 (16 years ago)

Author:

msteinbi

Message:

splited ProcessJobResult into two methods (StoreFinishedJobResult, ProcessSnapshot) (#531)

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Contracts/Interfaces/IClientCommunicator.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/ClientCommunicator.cs (modified) (4 diffs)
• HeuristicLab.Hive.Server.Core/ClientFacade.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Hive.Contracts/Interfaces/IClientCommunicator.cs

@@ -40 +40 @@
     ResponseJob SendJob(Guid clientId);
     [OperationContract]
-    ResponseResultReceived ProcessJobResult(Guid clientId, 
+    ResponseResultReceived StoreFinishedJobResult(Guid clientId, 
       long jobId, 
       byte[] result, 
       double percentage,
-      Exception exception,  
-      bool finished);
+      Exception exception);
+    [OperationContract]
+    ResponseResultReceived ProcessSnapshot(Guid clientId, 
+      long jobId, 
+      byte[] result, 
+      double percentage, 
+      Exception exception);
     [OperationContract]
     Response Logout(Guid clientId);

trunk/sources/HeuristicLab.Hive.Server.Core/ClientCommunicator.cs

@@ -246 +246 @@
     }
 
-    /// <summary>
-    /// the client can send job results during calculating 
-    /// and will send a final job result when he finished calculating
-    /// these job results will be stored in the database
-    /// </summary>
-    /// <param name="clientId"></param>
-    /// <param name="jobId"></param>
-    /// <param name="result"></param>
-    /// <param name="exception"></param>
-    /// <param name="finished"></param>
-    /// <returns></returns>
-    public ResponseResultReceived ProcessJobResult(Guid clientId, 
-      long jobId, 
-      byte[] result, 
+    private ResponseResultReceived ProcessJobResult(Guid clientId,
+      long jobId,
+      byte[] result,
       double percentage,
-      Exception exception,  
+      Exception exception,
       bool finished) {
+
       ResponseResultReceived response = new ResponseResultReceived();
       ClientInfo client =
         clientAdapter.GetById(clientId);
 
-      Job job = 
+      Job job =
         jobAdapter.GetById(jobId);
 
-      if (job.Client == null)    {
+      if (job.Client == null) {
         response.Success = false;
         response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_IS_NOT_BEEING_CALCULATED;
@@ -288 +278 @@
         response.Success = true;
         response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOBRESULT_RECEIVED;
-        return response;        
+        return response;
       }
       if (job.State != State.calculating) {
@@ -306 +296 @@
 
         List<JobResult> jobResults = new List<JobResult>(jobResultAdapter.GetResultsOf(job));
-        foreach (JobResult currentResult in jobResults) 
+        foreach (JobResult currentResult in jobResults)
           jobResultAdapter.Delete(currentResult);
       }
@@ -330 +320 @@
     }
 
+
+    /// <summary>
+    /// the client can send job results during calculating 
+    /// and will send a final job result when he finished calculating
+    /// these job results will be stored in the database
+    /// </summary>
+    /// <param name="clientId"></param>
+    /// <param name="jobId"></param>
+    /// <param name="result"></param>
+    /// <param name="exception"></param>
+    /// <param name="finished"></param>
+    /// <returns></returns>
+    public ResponseResultReceived StoreFinishedJobResult(Guid clientId, 
+      long jobId, 
+      byte[] result, 
+      double percentage,
+      Exception exception) {
+
+      return ProcessJobResult(clientId, jobId, result, percentage, exception, true);
+    }
+
+
+    public ResponseResultReceived ProcessSnapshot(Guid clientId, long jobId, byte[] result, double percentage, Exception exception) {
+      return ProcessJobResult(clientId, jobId, result, percentage, exception, false);
+    }
+
     /// <summary>
     /// when a client logs out the state will be set

trunk/sources/HeuristicLab.Hive.Server.Core/ClientFacade.cs

@@ -48 +48 @@
     }
 
-    public ResponseResultReceived ProcessJobResult(Guid clientId,
+    public ResponseResultReceived StoreFinishedJobResult(Guid clientId,
       long jobId,
       byte[] result,
       double percentage, 
-      Exception exception,
-      bool finished) {
-      return clientCommunicator.ProcessJobResult(clientId, jobId, result, percentage, exception, finished);
+      Exception exception) {
+      return clientCommunicator.StoreFinishedJobResult(clientId, jobId, result, percentage, exception);
     }
 
@@ -69 +68 @@
     }
 
+    public ResponseResultReceived ProcessSnapshot(Guid clientId, long jobId, byte[] result, double percentage, Exception exception) {
+      throw new NotImplementedException();
+    }
+
     #endregion
   }