pgsqlclient-checkins

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

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

Modified Files:
	PgDbClient.cs 
Log Message:
Added changes for better generation of the character set collection.

Index: PgDbClient.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/NPgClient/PgDbClient.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** PgDbClient.cs	1 Sep 2003 11:56:23 -0000	1.8
--- PgDbClient.cs	2 Sep 2003 10:32:46 -0000	1.9
***************
*** 690,714 ****
  			charSets = new PgCharSetCollection();
  			
! 			charSets.Add("SQL_ASCII", "ascii");			// ASCII
  			try
  			{
! 				charSets.Add("EUC_JP"	, "euc-jp");		// Japanese EUC
! 				charSets.Add("EUC_CN"	, "euc-cn");		// Chinese EUC
  			}
  			catch (Exception)
  			{
  			}
- 			charSets.Add("UNICODE"	, "UTF-8");			// Unicode (UTF-8)			
- 			charSets.Add("LATIN1"	, "iso-8859-1");	// ISO 8859-1/ECMA 94 (Latin alphabet no.1)			
- 			charSets.Add("LATIN2"	, "iso-8859-2");	// ISO 8859-2/ECMA 94 (Latin alphabet no.2)			
- 			charSets.Add("LATIN4"	, 1257);			// ISO 8859-4/ECMA 94 (Latin alphabet no.4)
- 			charSets.Add("ISO_8859_7", 1253);			// ISO 8859-7/ECMA 118 (Latin/Greek)			
- 			charSets.Add("LATIN9"	, "iso-8859-15");	// ISO 8859-15 (Latin alphabet no.9)			
- 			charSets.Add("KOI8"		, "koi8-r");		// 	KOI8-R(U)			
- 			charSets.Add("WIN"		, "windows-1251");	// Windows CP1251			
- 			charSets.Add("WIN1256"	, "windows-1256");	// Windows CP1256 (Arabic)			
- 			charSets.Add("WIN1256"	, "windows-1256");	// Windows CP1256 (Arabic)			
- 			charSets.Add("WIN1256"	, "windows-1258");	// TCVN-5712/Windows CP1258 (Vietnamese)			
- 			charSets.Add("WIN1256"	, "windows-874");	// Windows CP874 (Thai)
  		}
  
--- 690,730 ----
  			charSets = new PgCharSetCollection();
  			
! 			PgDbClient.addCharset("SQL_ASCII"	, "ascii");			// ASCII
! 			PgDbClient.addCharset("EUC_JP"		, "euc-jp");		// Japanese EUC
! 			PgDbClient.addCharset("EUC_CN"		, "euc-cn");		// Chinese EUC
! 			PgDbClient.addCharset("UNICODE"		, "UTF-8");			// Unicode (UTF-8)			
! 			PgDbClient.addCharset("LATIN1"		, "iso-8859-1");	// ISO 8859-1/ECMA 94 (Latin alphabet no.1)			
! 			PgDbClient.addCharset("LATIN2"		, "iso-8859-2");	// ISO 8859-2/ECMA 94 (Latin alphabet no.2)			
! 			PgDbClient.addCharset("LATIN4"		, 1257);			// ISO 8859-4/ECMA 94 (Latin alphabet no.4)
! 			PgDbClient.addCharset("ISO_8859_7"	, 1253);			// ISO 8859-7/ECMA 118 (Latin/Greek)			
! 			PgDbClient.addCharset("LATIN9"		, "iso-8859-15");	// ISO 8859-15 (Latin alphabet no.9)
! 			PgDbClient.addCharset("KOI8"		, "koi8-r");		// KOI8-R(U)
! 			PgDbClient.addCharset("WIN"			, "windows-1251");	// Windows CP1251			
! 			PgDbClient.addCharset("WIN1256"		, "windows-1256");	// Windows CP1256 (Arabic)			
! 			PgDbClient.addCharset("WIN1256"		, "windows-1256");	// Windows CP1256 (Arabic)			
! 			PgDbClient.addCharset("WIN1256"		, "windows-1258");	// TCVN-5712/Windows CP1258 (Vietnamese)			
! 			PgDbClient.addCharset("WIN1256"		, "windows-874");	// Windows CP874 (Thai)
! 		}
! 
! 		private static void addCharset(string charset, string systemCharset)
! 		{
  			try
  			{
! 				charSets.Add(charset, systemCharset);
! 			}
! 			catch (Exception)
! 			{
! 			}
! 		}
! 
! 		private static void addCharset(string charset, int cp)
! 		{
! 			try
! 			{
! 				charSets.Add(charset, cp);
  			}
  			catch (Exception)
  			{
  			}
  		}