Working on PPC machine setup.

1 files changed, 17 insertions, 4 deletions

diff --git a/Software/Visual_Studio/Tango.SQLExaminer/ExaminerSequenceConfigurationRunner.cs b/Software/Visual_Studio/Tango.SQLExaminer/ExaminerSequenceConfigurationRunner.cs
index f6a5b31c2..b9ee986bc 100644
--- a/Software/Visual_Studio/Tango.SQLExaminer/ExaminerSequenceConfigurationRunner.cs
+++ b/Software/Visual_Studio/Tango.SQLExaminer/ExaminerSequenceConfigurationRunner.cs
@@ -22,6 +22,8 @@ namespace Tango.SQLExaminer
 
         public String ScriptsFolder { get; private set; }
 
+        public ExaminerSequenceConfiguration Configuration { get; private set; }
+
         public ExaminerSequenceConfigurationRunner(String sequenceFile, String scriptsFolder, ExaminerSequenceDataSource source, ExaminerSequenceDataSource target, String machineSerialNumber)
         {
             SequenceFile = sequenceFile;
@@ -29,21 +31,32 @@ namespace Tango.SQLExaminer
             Source = source;
             Target = target;
             MachineSerialNumber = machineSerialNumber;
+            Configuration = ExaminerSequenceConfiguration.FromFile(sequenceFile);
         }
 
         public Task Run()
         {
             return Task.Factory.StartNew(() =>
             {
-                ExaminerSequenceConfiguration sequence = ExaminerSequenceConfiguration.FromFile(SequenceFile);
+                ExaminerSequenceConfiguration sequence = Configuration;
 
-                foreach (var item in sequence.Items)
+                foreach (var item in sequence.Items.OrderBy(x => x.Index))
                 {
                     ScriptExecuting?.Invoke(this, item);
 
                     ExaminerConfigurationBuilder builder = new ExaminerConfigurationBuilder(Path.Combine(ScriptsFolder, item.FileName));
-                    builder.SetSourceServer(Source.Address, Source.DataBaseName, Source.IntegratedSecurity, Source.UserName, Source.Password);
-                    builder.SetTargetServer(Target.Address, Target.DataBaseName, Target.IntegratedSecurity, Target.UserName, Target.Password);
+
+
+                    if (item.Direction == ExaminerSequenceItemDirection.SourceToTarget)
+                    {
+                        builder.SetSourceServer(Source.Address, Source.DataBaseName, Source.IntegratedSecurity, Source.UserName, Source.Password);
+                        builder.SetTargetServer(Target.Address, Target.DataBaseName, Target.IntegratedSecurity, Target.UserName, Target.Password);
+                    }
+                    else
+                    {
+                        builder.SetSourceServer(Target.Address, Target.DataBaseName, Target.IntegratedSecurity, Target.UserName, Target.Password);
+                        builder.SetTargetServer(Source.Address, Source.DataBaseName, Source.IntegratedSecurity, Source.UserName, Source.Password);
+                    }
 
                     if (item.RequiresSerialNumber)
                     {