[pgsqlclient-checkins] pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/NPgClient PgCharSetCollection.cs,1.4,1.5 PgClientErrorCollection.cs,1.4,1.5

[<car...@us...>]

Update of /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/NPgClient
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2894

Modified Files:
	PgCharSetCollection.cs PgClientErrorCollection.cs 
Log Message:
Removed spcific mono hack

Index: PgCharSetCollection.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/NPgClient/PgCharSetCollection.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PgCharSetCollection.cs	9 Feb 2004 14:20:45 -0000	1.4
--- PgCharSetCollection.cs	6 Mar 2004 14:51:43 -0000	1.5
***************
*** 95,106 ****
  		private bool cultureAwareCompare(string strA, string strB)
  		{
! 			try
! 			{
! 				return CultureInfo.CurrentCulture.CompareInfo.Compare(strA, strB, CompareOptions.IgnoreKanaType | CompareOptions.IgnoreWidth | CompareOptions.IgnoreCase) == 0 ? true : false;
! 			}
! 			catch (Exception)
! 			{
! 				return strA.ToUpper() == strB.ToUpper() ? true : false;
! 			}
  		}
  
--- 95,103 ----
  		private bool cultureAwareCompare(string strA, string strB)
  		{
! 			return CultureInfo.CurrentCulture.CompareInfo.Compare(
! 				strA, 
! 				strB, 
! 				CompareOptions.IgnoreKanaType | CompareOptions.IgnoreWidth | 
! 				CompareOptions.IgnoreCase) == 0 ? true : false;
  		}
  

Index: PgClientErrorCollection.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/NPgClient/PgClientErrorCollection.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PgClientErrorCollection.cs	9 Feb 2004 14:20:45 -0000	1.4
--- PgClientErrorCollection.cs	6 Mar 2004 14:51:43 -0000	1.5
***************
*** 83,94 ****
  		private bool cultureAwareCompare(string strA, string strB)
  		{
! 			try
! 			{
! 				return CultureInfo.CurrentCulture.CompareInfo.Compare(strA, strB, CompareOptions.IgnoreKanaType | CompareOptions.IgnoreWidth | CompareOptions.IgnoreCase) == 0 ? true : false;
! 			}
! 			catch (Exception)
! 			{
! 				return strA.ToUpper() == strB.ToUpper() ? true : false;
! 			}
  		}
  
--- 83,91 ----
  		private bool cultureAwareCompare(string strA, string strB)
  		{
! 			return CultureInfo.CurrentCulture.CompareInfo.Compare(
! 				strA, 
! 				strB, 
! 				CompareOptions.IgnoreKanaType | CompareOptions.IgnoreWidth | 
! 				CompareOptions.IgnoreCase) == 0 ? true : false;
  		}