Changeset 3578 for trunk/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/JobDao.cs

Timestamp:

05/01/10 13:58:24 (14 years ago)

Author:

kgrading

Message:

Removed References to HiveLogging and updated the default logging mechanism (#991)

File:

• trunk/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/JobDao.cs (modified) (8 diffs)

trunk/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/JobDao.cs

@@ -25 +25 @@
     }
 
+    public IEnumerable<JobDto> FindWithLimitations(State jobState, int offset, int count) {
+
+      IQueryable<JobDto> query = null;
+      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) {
+        query = from job in Context.Jobs
+                    where job.JobState == Enum.GetName(typeof(State), jobState)
+                    orderby job.DateCalculated
+                    select EntityToDto(job, null);
+      } else {
+        query = from job in Context.Jobs
+                    where job.JobState == Enum.GetName(typeof(State), jobState)
+                    orderby job.DateCreated
+                    select EntityToDto(job, null);
+      }
+
+      return query.Skip(offset).Take(count).ToList();
+    }
+
+
     public byte[] GetBinaryJobFile(Guid jobId) {
       return (from job in Context.Jobs
@@ -34 +58 @@
       Job j = DtoToEntity(bObj, null);
       Context.Jobs.InsertOnSubmit(j);
-      Context.SubmitChanges();
+      CommitChanges();
       bObj.Id = j.JobId;
       return bObj;
@@ -45 +69 @@
         j.AssignedResources.Add(new AssignedResource { ResourceId = assignRessourceId});
       Context.Jobs.InsertOnSubmit(j);
-      Context.SubmitChanges();
+      CommitChanges();
       job.JobInfo.Id = j.JobId;
       return job;
@@ -54 +78 @@
       Job job = Context.Jobs.SingleOrDefault(j => j.JobId.Equals(bObj.Id));
       Context.Jobs.DeleteOnSubmit(job);
-      Context.SubmitChanges();
+      CommitChanges();
     }
 
     public void Update(JobDto bObj) {
       Job job = Context.Jobs.SingleOrDefault(j => j.JobId.Equals(bObj.Id));
-      DtoToEntity(bObj, job);
-      try {
-        Context.SubmitChanges();
-      } catch (ChangeConflictException cfe) {
-        
-      }
+      DtoToEntity(bObj, job);    
+      CommitChanges(); 
     }
 
@@ -105 +125 @@
       c.Jobs.Add(j);
       j.Client = c;
-      Context.SubmitChanges();      
+      CommitChanges();      
     }
 
@@ -112 +132 @@
       j.Client = null;
       j.JobState = Enum.GetName(typeof(State), State.offline); 
-      Context.SubmitChanges();
+      CommitChanges();
     }
 
@@ -137 +157 @@
       target.DateCalculated = source.DateCalculated;
       target.DateCreated = source.DateCreated;
+      target.DateFinished = source.DateFinished;
       target.JobId = source.Id;
 
@@ -162 +183 @@
       target.MemoryNeeded = source.MemoryNeeded;
 
-
-
       target.DateCalculated = source.DateCalculated;
       target.DateCreated = source.DateCreated;
+      target.DateFinished = source.DateFinished;
       target.Id = source.JobId;
-      
-          
+       
       target.Percentage = source.Percentage;