--- parser3/src/main/pa_charsets.C	2003/01/29 11:30:06	1.11.2.5
+++ parser3/src/main/pa_charsets.C	2007/04/23 10:30:31	1.17
@@ -1,41 +1,43 @@
 /** @file
 	Parser: sql driver manager implementation.
 
-	Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_CHARSETS_C="$Date: 2003/01/29 11:30:06 $";
+static const char * const IDENT_CHARSETS_C="$Date: 2007/04/23 10:30:31 $";
 
 #include "pa_charsets.h"
-#include "pa_value_includes.h"
+
+// defines for globals
+
+#define CHARSET_UTF8_NAME "UTF-8"
 
 // globals
 
+Charset UTF8_charset(0, *new String(CHARSET_UTF8_NAME), 0/*no file=system*/);
+
 Charsets charsets;
 
 // methods
 
 Charsets::Charsets() {
-	put(UTF8_charset->name(), UTF8_charset);
+	put(UTF8_charset.NAME(), &UTF8_charset);
 }
 
-Charset& Charsets::get(ConstStringPtr aname) {
-	if(CharsetPtr result=Hash<key_type, value_type>::get(aname))
-		return result.get();
+Charset& Charsets::get(const String::Body ANAME) {
+	if(Charset* result=Hash<key_type, value_type>::get(ANAME))
+		return *result;
 	else
-		throw Exception("parser.runtime",
-			aname,
+		throw Exception(PARSER_RUNTIME,
+			new String(ANAME, String::L_TAINTED),
 			"unknown charset");
 }
 
-void Charsets::load_charset(ConstStringPtr arequest_name, ConstStringPtr arequest_file_spec) {
+void Charsets::load_charset(Request_charsets& charsets, const String::Body ANAME, const String& afile_spec) {
 	//we know that charset?
-	if(get(arequest_name)) 
+	if(Hash<key_type, value_type>::get(ANAME)) 
 		return; // don't load it then
 
-	// make global_name string on cache_pool pool
-	StringPtr global_name(new String(arequest_name->cstr(charsets_pool)));
-	
-	put(global_name, value_type(new Charset(global_name, arequest_file_spec)));
+	put(ANAME, new Charset(&charsets, ANAME, &afile_spec));
 }