Changeset 7625 for branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.DbExplorer.Interfaces

Timestamp:

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

Author:

mkommend

Message:

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

File:

• branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.DbExplorer.Interfaces/DbExplorerBase.cs (modified) (3 diffs)

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