Changeset 7625

Timestamp:

03/15/12 17:51:45 (13 years ago)

Author:

mkommend

Message:

#1734: merged changes in data importer from the heureka rep

Location:

branches/HeuristicLab.DataImporter

Files:

• HeuristicLab.DataImporter.Command/Aggregation/AggregateCommandBase.cs (modified) (1 diff)
• HeuristicLab.DataImporter.Command/Aggregation/DeleteRowsWithDuplicateKeyValuesCommand.cs (modified) (1 diff)
• HeuristicLab.DataImporter.Command/ChangeDataset/AlignColumnGroupsCommand.cs (modified) (2 diffs)
• HeuristicLab.DataImporter.Data/Command/DeleteColumnCommand.cs (modified) (2 diffs)
• HeuristicLab.DataImporter.DbExplorer.Interfaces/DbExplorerBase.cs (modified) (3 diffs)

branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/Aggregation/AggregateCommandBase.cs

@@ -74 +74 @@
     public override void Execute() {
       base.Execute();
+      if (!ColumnGroup.Columns.Any()) return;
       if (!ColumnGroup.Sorted)
         throw new CommandExecutionException("ColumnGroup must be sorted to use aggregation commands.", this);

branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/Aggregation/DeleteRowsWithDuplicateKeyValuesCommand.cs

@@ -50 +50 @@
     public override void Execute() {
       base.Execute();
+      if (!ColumnGroup.Columns.Any()) return;
       if (!ColumnGroup.Sorted)
         throw new CommandExecutionException("ColumnGroup must be sorted to delete rows with duplicate key.", this);

branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeDataset/AlignColumnGroupsCommand.cs

@@ -56 +56 @@
       this.removePos2 = this.DataSet.IndexOfColumnGroup(oldColumnGroup2);
 
+      if (!oldColumnGroup1.Columns.Any() || !oldColumnGroup2.Columns.Any()) return;
+
       if (oldColumnGroup1.SortedColumnsCount < 1 || oldColumnGroup1.SortedColumnsCount != oldColumnGroup2.SortedColumnsCount)
         throw new CommandExecutionException("Both ColumnGroups must be sorted by at least one column and must be sorted by the same number of columns.", this);
@@ -64 +66 @@
         if (this.oldColumnGroup1.Columns.ElementAt(oldColumnGroup1.SortedColumnIndexes.ElementAt(i)).DataType !=
             this.oldColumnGroup2.Columns.ElementAt(oldColumnGroup2.SortedColumnIndexes.ElementAt(i)).DataType)
-          throw new CommandExecutionException("Both ColumnGroups must be sorted by columns of the same type",this);
+          throw new CommandExecutionException("Both ColumnGroups must be sorted by columns of the same type", this);
       }
 

branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Data/Command/DeleteColumnCommand.cs

@@ -48 +48 @@
       base.Execute();
       this.oldSortedColumnIndices = new List<int>(ColumnGroup.SortedColumnIndexes);
+      if (!ColumnGroup.Columns.Any()) return;
+
       ColumnBase column;
       foreach (int columnIndex in AffectedColumns.Reverse()) {
@@ -62 +64 @@
     public override void UndoExecute() {
       base.UndoExecute();
-      for (int i = 0; i < AffectedColumns.Length; i++)
+      for (int i = 0; i < deletedColumns.Count; i++)
         ColumnGroup.InsertColumn(AffectedColumns[i], deletedColumns[i]);
 

branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.DbExplorer.Interfaces/DbExplorerBase.cs

@@ -101 +101 @@
               filterColumns.Add(col);
             }
-          cmdText += "count(*) from " + EscapeSqlString(table.OwnerName )+ "." + EscapeSqlString(table.TableName);
+          cmdText += "count(*) from " + EscapeSqlString(table.OwnerName) + "." + EscapeSqlString(table.TableName);
           cmd.CommandText = cmdText;
 
@@ -222 +222 @@
               //fill columns with values
               for (int i = 0; i < reader.FieldCount; i++) {
-                if (reader.IsDBNull(i))
+                if (reader.IsDBNull(i)) {
                   columnGroup.Columns.ElementAt(i).AddValue(null);
-                else if (columnGroup.Columns.ElementAt(i).DataType == typeof(double?))
-                  columnGroup.Columns.ElementAt(i).AddValue(Convert.ToDouble(reader.GetValue(i)));
-                else if (columnGroup.Columns.ElementAt(i).DataType == typeof(DateTime?))
-                  columnGroup.Columns.ElementAt(i).AddValue(reader.GetDateTime(i));
-                else
-                  columnGroup.Columns.ElementAt(i).AddValue(reader.GetValue(i).ToString());
+                } else if (columnGroup.Columns.ElementAt(i).DataType == typeof(double?)) {
+                  try { columnGroup.Columns.ElementAt(i).AddValue(Convert.ToDouble(reader.GetValue(i))); }
+                  catch (DbException) { columnGroup.Columns.ElementAt(i).AddValue(null); }
+                } else if (columnGroup.Columns.ElementAt(i).DataType == typeof(DateTime?)) {
+                  try { columnGroup.Columns.ElementAt(i).AddValue(reader.GetDateTime(i)); }
+                  catch (DbException) { columnGroup.Columns.ElementAt(i).AddValue(null); }
+                } else {
+                  try { columnGroup.Columns.ElementAt(i).AddValue(reader.GetValue(i).ToString()); }
+                  catch (DbException) { columnGroup.Columns.ElementAt(i).AddValue(null); }
+                }
               }
               actRow++;
@@ -235 +239 @@
                 FireNewRowLoaded(actRow);
             }
+            if (initColumns) {
+              for (int i = 0; i < reader.FieldCount; i++) {
+                if (reader.GetName(i).ToUpper().Contains("ZEIT"))
+                  columnGroup.AddColumn(new DateTimeColumn(reader.GetName(i)));
+                else
+                  columnGroup.AddColumn(new DoubleColumn(reader.GetName(i)));
+              }
+            }
             reader.Close();
           }  //end using reader