Changeset 4116 for branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/JobDao.cs

Timestamp:

07/27/10 18:36:36 (14 years ago)

Author:

cneumuel

Message:

worked on HiveExperiment (#1115)

File:

• branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/JobDao.cs (modified) (5 diffs)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/JobDao.cs

@@ -28 +28 @@
 
       IQueryable<JobDto> query = null;
-      if (jobState == State.finished) {
+      if (jobState == State.Finished) {
          query = from job in Context.Jobs
                  where job.JobState == Enum.GetName(typeof (State), jobState)
                  orderby job.DateFinished
                  select EntityToDto(job, null);
-      } else if (jobState == State.calculating || jobState == State.requestSnapshot || jobState == State.requestSnapshotSent) {
+      } else if (jobState == State.Calculating || jobState == State.RequestSnapshot || jobState == State.RequestSnapshotSent) {
         query = from job in Context.Jobs
                     where job.JobState == Enum.GetName(typeof(State), jobState)
@@ -97 +97 @@
     public IEnumerable<JobDto> FindActiveJobsOfClient(ClientDto client) {
       return (from j in Context.Jobs
-              where (j.JobState == Enum.GetName(typeof (State), State.calculating) ||
-                     j.JobState == Enum.GetName(typeof (State), State.abort) ||
-                     j.JobState == Enum.GetName(typeof (State), State.requestSnapshot) ||
-                     j.JobState == Enum.GetName(typeof (State), State.requestSnapshotSent)) &&
+              where (j.JobState == Enum.GetName(typeof (State), State.Calculating) ||
+                     j.JobState == Enum.GetName(typeof (State), State.Abort) ||
+                     j.JobState == Enum.GetName(typeof (State), State.RequestSnapshot) ||
+                     j.JobState == Enum.GetName(typeof (State), State.RequestSnapshotSent)) &&
                     (j.ResourceId.Equals(client.Id))
               select EntityToDto(j, null)).ToList();
@@ -112 +112 @@
       
       var q = (from ar in Context.AssignedResources               
-               where ar.Job.JobState == Enum.GetName(typeof (State), State.offline) &&
+               where ar.Job.JobState == Enum.GetName(typeof (State), State.Offline) &&
                      ar.Job.CoresNeeded <= freeCores &&
                      ar.Job.MemoryNeeded <= freeMemory &&
@@ -139 +139 @@
       Job j = Context.Jobs.SingleOrDefault(jq => jq.JobId.Equals(job.Id));
       j.Client = null;
-      j.JobState = Enum.GetName(typeof(State), State.offline); 
+      j.JobState = Enum.GetName(typeof(State), State.Offline); 
       CommitChanges();
     }
@@ -199 +199 @@
       
       target.Priority = source.Priority;
-      target.State = (State) Enum.Parse(typeof (State), source.JobState);
+      target.State = (State) Enum.Parse(typeof (State), source.JobState, true);
       return target;
     }