Changeset 5526 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4/Convert.cs

Timestamp:

02/21/11 17:35:42 (13 years ago)

Author:

cneumuel

Message:

#1233

• fixed handling of StateLog in DataLayer
• extended unit tests
• changed style of service calls to OKB-like style (using delegates)
• added possibility that parent jobs can be finished immediately when child jobs are finished

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4/Convert.cs (modified) (2 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.DataAccess/3.4/Convert.cs

@@ -40 +40 @@
         LastHeartbeat = source.LastHeartbeat,
         State = source.State,
-        StateLog = source.StateLogs.Select(x => Convert.ToDto(x)).OrderBy(x => x.DateTime).ToList()
+        StateLog = source.StateLogs.Select(x => Convert.ToDto(x)).OrderBy(x => x.DateTime).ToList(),
+        IsParentJob = source.IsParentJob,
+        FinishWhenChildJobsFinished = source.FinishWhenChildJobsFinished
       };
     }
@@ -59 +61 @@
         target.State = source.State;
         if (target.StateLogs == null) target.StateLogs = new EntitySet<StateLog>();
-        target.StateLogs.AddRange(source.StateLog.Select(x => Convert.ToEntity(x)).OrderBy(x => x.DateTime));
+        foreach (DT.StateLog sl in source.StateLog.Where(x => x.Id == Guid.Empty)) {
+          target.StateLogs.Add(Convert.ToEntity(sl));
+        }
+        
+        //target.StateLogs.AddRange(source.StateLog.Select(x => Convert.ToEntity(x)).OrderBy(x => x.DateTime));
+        target.IsParentJob = source.IsParentJob;
+        target.FinishWhenChildJobsFinished = source.FinishWhenChildJobsFinished;
         // RequiredPlugins are added by Dao
       }