Move ADO.NET dependent class to separate file

rcd · Jan 7, 2013 · 1c856cb · 1c856cb
1 parent d5e76d3
commit 1c856cb
Show file tree

Hide file tree

Showing 3 changed files with 124 additions and 121 deletions.
diff --git a/DICOM/DICOM.csproj b/DICOM/DICOM.csproj
@@ -58,6 +58,7 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="DatabaseQueryTransformRule.cs" />
     <Compile Include="DicomDataException.cs" />
     <Compile Include="DicomDataset.cs" />
     <Compile Include="DicomDatasetExtensions.cs" />
@@ -263,7 +264,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_UseGlobalSettings="True" BuildVersion_BuildVersioningStyle="None.None.Increment.YearDayOfYear" />
+      <UserProperties BuildVersion_BuildVersioningStyle="None.None.Increment.YearDayOfYear" BuildVersion_UseGlobalSettings="True" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/DICOM/DatabaseQueryTransformRule.cs b/DICOM/DatabaseQueryTransformRule.cs
@@ -0,0 +1,122 @@
+using System;
+using System.Collections.Generic;
+
+namespace Dicom
+{
+    public enum DatabaseType
+    {
+        Odbc,
+        MsSql,
+        DB2
+    }
+
+    /// <summary>
+    /// Updates a DICOM dataset based on a database query.
+    /// </summary>
+    public class DatabaseQueryTransformRule : IDicomTransformRule {
+        #region Private Members
+        private string _connectionString;
+        private DatabaseType _dbType;
+        private string _query;
+        private List<DicomTag> _output;
+        private List<DicomTag> _params;
+        #endregion
+
+        #region Public Constructor
+        public DatabaseQueryTransformRule() {
+            _dbType = DatabaseType.MsSql;
+            _output = new List<DicomTag>();
+            _params = new List<DicomTag>();
+        }
+
+        public DatabaseQueryTransformRule(string connectionString, DatabaseType dbType, string query, DicomTag[] outputTags, DicomTag[] paramTags) {
+            _connectionString = connectionString;
+            _dbType = dbType;
+            _query = query;
+            _output = new List<DicomTag>(outputTags);
+            _params = new List<DicomTag>(paramTags);
+        }
+        #endregion
+
+        #region Public Properties
+        public string ConnectionString {
+            get { return _connectionString; }
+            set { _connectionString = value; }
+        }
+
+        public DatabaseType ConnectionType {
+            get { return _dbType; }
+            set { _dbType = value; }
+        }
+
+        public string Query {
+            get { return _query; }
+            set { _query = value; }
+        }
+
+        public List<DicomTag> Output {
+            get { return _output; }
+            set { _output = value; }
+        }
+
+        public List<DicomTag> Parameters {
+            get { return _params; }
+            set { _params = value; }
+        }
+        #endregion
+
+        #region Public Methods
+        public void Transform(DicomDataset dataset, DicomDataset modifiedAttributesSequenceItem = null) {
+            IDbConnection connection = null;
+
+            try {
+                if (_dbType == DatabaseType.Odbc)
+                    connection = new OdbcConnection(_connectionString);
+                else if (_dbType == DatabaseType.MsSql)
+                    connection = new SqlConnection(_connectionString);
+
+                using (IDbCommand command = connection.CreateCommand()) {
+                    command.Connection = connection;
+                    command.CommandText = _query;
+
+                    for (int i = 0; i < _params.Count; i++) {
+                        var str = dataset.Get<string>(_params[i], -1, String.Empty);
+                        SqlParameter prm = new SqlParameter(String.Format("@{0}", i), str);
+                        command.Parameters.Add(prm);
+                    }
+
+                    connection.Open();
+
+                    if (_output.Count == 0) {
+                        command.ExecuteNonQuery();
+                    } else {
+                        using (IDataReader reader = command.ExecuteReader()) {
+                            if (reader.Read()) {
+                                for (int i = 0; i < _output.Count; i++) {
+                                    dataset.CopyTo(modifiedAttributesSequenceItem, _output[i]);
+                                    string str = reader.GetString(i);
+                                    dataset.Add(_output[i], str);
+                                }
+                            }
+                        }
+                    }
+
+                    connection.Close();
+
+                    connection = null;
+                }
+            } finally {
+                if (connection != null) {
+                    if (connection.State == ConnectionState.Closed || connection.State == ConnectionState.Broken)
+                        connection.Close();
+                    connection.Dispose();
+                }
+            }
+        }
+
+        public override string ToString() {
+            return base.ToString();
+        }
+        #endregion
+    }
+}
diff --git a/DICOM/DicomTransformRules.cs b/DICOM/DicomTransformRules.cs
@@ -1,9 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Data;
-using System.Data.Odbc;
-using System.Data.Sql;
-using System.Data.SqlClient;
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
@@ -592,120 +588,4 @@ public class GenerateUidDicomTransformRule : IDicomTransformRule {
 		}
 		#endregion
 	}
-
-	public enum DatabaseType {
-		Odbc,
-		MsSql,
-		DB2
-	}
-
-	/// <summary>
-	/// Updates a DICOM dataset based on a database query.
-	/// </summary>
-	public class DatabaseQueryTransformRule : IDicomTransformRule {
-		#region Private Members
-		private string _connectionString;
-		private DatabaseType _dbType;
-		private string _query;
-		private List<DicomTag> _output;
-		private List<DicomTag> _params;
-		#endregion
-
-		#region Public Constructor
-		public DatabaseQueryTransformRule() {
-			_dbType = DatabaseType.MsSql;
-			_output = new List<DicomTag>();
-			_params = new List<DicomTag>();
-		}
-
-		public DatabaseQueryTransformRule(string connectionString, DatabaseType dbType, string query, DicomTag[] outputTags, DicomTag[] paramTags) {
-			_connectionString = connectionString;
-			_dbType = dbType;
-			_query = query;
-			_output = new List<DicomTag>(outputTags);
-			_params = new List<DicomTag>(paramTags);
-		}
-		#endregion
-
-		#region Public Properties
-		public string ConnectionString {
-			get { return _connectionString; }
-			set { _connectionString = value; }
-		}
-
-		public DatabaseType ConnectionType {
-			get { return _dbType; }
-			set { _dbType = value; }
-		}
-
-		public string Query {
-			get { return _query; }
-			set { _query = value; }
-		}
-
-		public List<DicomTag> Output {
-			get { return _output; }
-			set { _output = value; }
-		}
-
-		public List<DicomTag> Parameters {
-			get { return _params; }
-			set { _params = value; }
-		}
-		#endregion
-
-		#region Public Methods
-		public void Transform(DicomDataset dataset, DicomDataset modifiedAttributesSequenceItem = null) {
-			IDbConnection connection = null;
-
-			try {
-				if (_dbType == DatabaseType.Odbc)
-					connection = new OdbcConnection(_connectionString);
-				else if (_dbType == DatabaseType.MsSql)
-					connection = new SqlConnection(_connectionString);
-
-				using (IDbCommand command = connection.CreateCommand()) {
-					command.Connection = connection;
-					command.CommandText = _query;
-
-					for (int i = 0; i < _params.Count; i++) {
-						var str = dataset.Get<string>(_params[i], -1, String.Empty);
-						SqlParameter prm = new SqlParameter(String.Format("@{0}", i), str);
-						command.Parameters.Add(prm);
-					}
-
-					connection.Open();
-
-					if (_output.Count == 0) {
-						command.ExecuteNonQuery();
-					} else {
-						using (IDataReader reader = command.ExecuteReader()) {
-							if (reader.Read()) {
-								for (int i = 0; i < _output.Count; i++) {
-									dataset.CopyTo(modifiedAttributesSequenceItem, _output[i]);
-									string str = reader.GetString(i);
-									dataset.Add(_output[i], str);
-								}
-							}
-						}
-					}
-
-					connection.Close();
-
-					connection = null;
-				}
-			} finally {
-				if (connection != null) {
-					if (connection.State == ConnectionState.Closed || connection.State == ConnectionState.Broken)
-						connection.Close();
-					connection.Dispose();
-				}
-			}
-		}
-
-		public override string ToString() {
-			return base.ToString();
-		}
-		#endregion
-	}
 }