Changeset 11084 for branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Controllers/ExceptionDataController.cs

Timestamp:

07/04/14 08:59:24 (10 years ago)

Author:

mroscoe

Message:

 

File:

• branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Controllers/ExceptionDataController.cs (modified) (4 diffs)

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Controllers/ExceptionDataController.cs

@@ -9 +9 @@
   public class ExceptionDataController : Controller {
 
-    public JsonResult TaskExceptions(string limit, string userName, DateTime? start = null, DateTime? end = null, string jobId = null, string taskState = null)
+    public JsonResult TaskExceptions(string userName, DateTime? start = null, DateTime? end = null, string jobId = null, string taskState = null, string slaveId = null)
     {
       using (var db = new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString)) {
@@ -23 +23 @@
           (!end.HasValue || tasks.EndTime < end) &&
           (string.IsNullOrEmpty(jobId) || tasks.JobId.ToString() == jobId) &&
-          (string.IsNullOrEmpty(taskState) || tasks.TaskState == state)
+          (string.IsNullOrEmpty(taskState) || tasks.TaskState == state) &&
+          (string.IsNullOrEmpty(slaveId) || tasks.LastClientId.ToString() == slaveId)
           select new
           {
@@ -29 +30 @@
             ErrorMessage = tasks.Exception,
             StartDate = tasks.StartTime
-          }).OrderByDescending(s => s.StartDate).Take(Convert.ToInt32(limit)).ToList();
+          }).OrderByDescending(s => s.StartDate).ToList();
 
         List<string> Task = new List<string>();
@@ -57 +58 @@
            UserName = jobs.UserName,
            StartDate = tasks.StartTime
-         }).OrderByDescending(s => s.StartDate).Take(Convert.ToInt32(limit)).ToList();
+         }).OrderByDescending(s => s.StartDate).ToList();
 
         List<List<string>> results = new List<List<string>>();