[Adapdev-commits] Adapdev/src/Adapdev.Data/Xml ProviderConfig.cs,1.2,1.3

[Trevor L. <tre...@us...>]

Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Xml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3367/src/Adapdev.Data/Xml

Modified Files:
	ProviderConfig.cs 
Log Message:
Changes to support filtering of Schemas for Oracle

Index: ProviderConfig.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Xml/ProviderConfig.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ProviderConfig.cs	13 Apr 2005 04:23:42 -0000	1.2
--- ProviderConfig.cs	14 Apr 2005 03:43:41 -0000	1.3
***************
*** 51,75 ****
  					foreach (DataRow settingsRow in connectionRow.GetChildRows("connection_settings")) {
  						if (settingsRow.Table.Columns.Contains("file"))		{
! 							connectionType.SupportsFile = GetSettingState(settingsRow["file"].ToString());
  							connectionType.PromptFile   = GetSettingValue(settingsRow["file"].ToString());
  						}
  						if (settingsRow.Table.Columns.Contains("server"))		{
! 							connectionType.SupportsServer = GetSettingState(settingsRow["server"].ToString());
  							connectionType.PromptServer   = GetSettingValue(settingsRow["server"].ToString());
  						}
  						if (settingsRow.Table.Columns.Contains("name"))		{
! 							connectionType.SupportsName = GetSettingState(settingsRow["name"].ToString());
  							connectionType.PromptName   = GetSettingValue(settingsRow["name"].ToString());
  						}
  						if (settingsRow.Table.Columns.Contains("userid"))		{
! 							connectionType.SupportsUserID = GetSettingState(settingsRow["userid"].ToString());
  							connectionType.PromptUserID   = GetSettingValue(settingsRow["userid"].ToString());
  						}
  						if (settingsRow.Table.Columns.Contains("password"))		{
! 							connectionType.SupportsPassword = GetSettingState(settingsRow["password"].ToString());
  							connectionType.PromptPassword   = GetSettingValue(settingsRow["password"].ToString());
  						}
  						if (settingsRow.Table.Columns.Contains("filter"))		{
! 							connectionType.SupportsFilter = GetSettingState(settingsRow["filter"].ToString());
  							connectionType.PromptFilter   = GetSettingValue(settingsRow["filter"].ToString());
  						}
--- 51,75 ----
  					foreach (DataRow settingsRow in connectionRow.GetChildRows("connection_settings")) {
  						if (settingsRow.Table.Columns.Contains("file"))		{
! 							connectionType.SupportsFile = GetSettingState(settingsRow["file"].ToString(),false);
  							connectionType.PromptFile   = GetSettingValue(settingsRow["file"].ToString());
  						}
  						if (settingsRow.Table.Columns.Contains("server"))		{
! 							connectionType.SupportsServer = GetSettingState(settingsRow["server"].ToString(),true);
  							connectionType.PromptServer   = GetSettingValue(settingsRow["server"].ToString());
  						}
  						if (settingsRow.Table.Columns.Contains("name"))		{
! 							connectionType.SupportsName = GetSettingState(settingsRow["name"].ToString(),true);
  							connectionType.PromptName   = GetSettingValue(settingsRow["name"].ToString());
  						}
  						if (settingsRow.Table.Columns.Contains("userid"))		{
! 							connectionType.SupportsUserID = GetSettingState(settingsRow["userid"].ToString(),true);
  							connectionType.PromptUserID   = GetSettingValue(settingsRow["userid"].ToString());
  						}
  						if (settingsRow.Table.Columns.Contains("password"))		{
! 							connectionType.SupportsPassword = GetSettingState(settingsRow["password"].ToString(),true);
  							connectionType.PromptPassword   = GetSettingValue(settingsRow["password"].ToString());
  						}
  						if (settingsRow.Table.Columns.Contains("filter"))		{
! 							connectionType.SupportsFilter = GetSettingState(settingsRow["filter"].ToString(),false);
  							connectionType.PromptFilter   = GetSettingValue(settingsRow["filter"].ToString());
  						}
***************
*** 87,92 ****
  							connectionProvider.Template = Regex.Replace(providerRow["provider_Text"].ToString(), @"[\r\t\n]", "");
  
! 							if (providerRow.Table.Columns.Contains("allowEmptyParameters")) connectionProvider.AllowEmptyParameters = GetSettingState(providerRow["allowEmptyParameters"].ToString());
! 							if (providerRow.Table.Columns.Contains("enabled")) connectionProvider.Enabled = GetSettingState(providerRow["enabled"].ToString());
  							if (providerRow.Table.Columns.Contains("fileMask")) connectionProvider.FileMask = providerRow["fileMask"].ToString();
  
--- 87,92 ----
  							connectionProvider.Template = Regex.Replace(providerRow["provider_Text"].ToString(), @"[\r\t\n]", "");
  
! 							if (providerRow.Table.Columns.Contains("allowEmptyParameters")) connectionProvider.AllowEmptyParameters = GetSettingState(providerRow["allowEmptyParameters"].ToString(), true);
! 							if (providerRow.Table.Columns.Contains("enabled")) connectionProvider.Enabled = GetSettingState(providerRow["enabled"].ToString(),true);
  							if (providerRow.Table.Columns.Contains("fileMask")) connectionProvider.FileMask = providerRow["fileMask"].ToString();
  
***************
*** 109,113 ****
  		/// <param name="setting"></param>
  		/// <returns></returns>
! 		private bool GetSettingState(string setting) {
  			try {
  				return Convert.ToBoolean(setting);
--- 109,115 ----
  		/// <param name="setting"></param>
  		/// <returns></returns>
! 		private bool GetSettingState(string setting, bool defaultFlag) {
! 			if (setting == null) return defaultFlag;
! 			if (setting.Equals(string.Empty)) return defaultFlag;
  			try {
  				return Convert.ToBoolean(setting);
***************
*** 124,131 ****
  		/// <returns></returns>
  		private string GetSettingValue(string setting) {
! 			if (GetSettingState(setting)) {
! 				if (setting.ToLower() != "true") return setting.Trim();
  			}
- 			return string.Empty;
  		}
  
--- 126,137 ----
  		/// <returns></returns>
  		private string GetSettingValue(string setting) {
! 			if (setting == null) return string.Empty;
! 			if (setting.Equals(string.Empty)) return string.Empty;
! 			try {
! 				bool flag = Convert.ToBoolean(setting);
! 				return string.Empty;
! 			} catch {
! 				return setting.Trim();
  			}
  		}