--- parser3/src/main/pa_charsets.C	2015/10/13 21:27:57	1.20
+++ parser3/src/main/pa_charsets.C	2024/11/04 03:53:25	1.27
@@ -1,13 +1,13 @@
 /** @file
 	Parser: sql driver manager implementation.
 
-	Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)
-	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
+	Copyright (c) 2001-2024 Art. Lebedev Studio (http://www.artlebedev.com)
+	Authors: Konstantin Morshnev <moko@design.ru>, Alexandr Petrosian <paf@design.ru>
 */
 
 #include "pa_charsets.h"
 
-volatile const char * IDENT_PA_CHARSETS_C="$Id: pa_charsets.C,v 1.20 2015/10/13 21:27:57 moko Exp $" IDENT_PA_CHARSETS_H;
+volatile const char * IDENT_PA_CHARSETS_C="$Id: pa_charsets.C,v 1.27 2024/11/04 03:53:25 moko Exp $" IDENT_PA_CHARSETS_H;
 
 // defines for globals
 
@@ -15,23 +15,29 @@ volatile const char * IDENT_PA_CHARSETS_
 
 // globals
 
-Charset UTF8_charset(0, *new String(CHARSET_UTF8_NAME), 0/*no file=system*/);
+Charset pa_UTF8_charset(0, *new String(CHARSET_UTF8_NAME), 0/*no file=system*/);
 
-Charsets charsets;
+Charsets pa_charsets;
 
 // methods
 
 Charsets::Charsets() {
-	put(UTF8_charset.NAME(), &UTF8_charset);
+	put(pa_UTF8_charset.NAME(), &pa_UTF8_charset);
 }
 
-Charset& Charsets::get(const String::Body ANAME) {
+Charset& Charsets::get(String::Body ANAME) {
+	ANAME=str_upper(ANAME.cstr(), ANAME.length());
 	if(Charset* result=HashString<value_type>::get(ANAME))
 		return *result;
 	else
-		throw Exception(PARSER_RUNTIME,
-			new String(ANAME, String::L_TAINTED),
-			"unknown charset");
+		throw Exception(PARSER_RUNTIME, new String(ANAME, String::L_TAINTED), "unknown charset");
+}
+
+Charset& Charsets::get_direct(const char *ANAME) {
+	if(Charset* result=HashString<value_type>::get(ANAME))
+		return *result;
+	else
+		throw Exception(PARSER_RUNTIME, new String(ANAME, String::L_TAINTED), "unknown charset");
 }
 
 Charset* Charsets::checkBOM(char *&body,size_t &body_size, Charset* enforced_charset){
@@ -39,12 +45,13 @@ Charset* Charsets::checkBOM(char *&body,
 		// skip UTF-8 signature (BOM code)
 		body+=3;
 		body_size-=3;
-		return &UTF8_charset;
+		return &pa_UTF8_charset;
 	}
 	return enforced_charset;
 }
 
-void Charsets::load_charset(Request_charsets& charsets, const String::Body ANAME, const String& afile_spec) {
+void Charsets::load_charset(Request_charsets& charsets, String::Body ANAME, const String& afile_spec) {
+	ANAME=str_upper(ANAME.cstr(), ANAME.length());
 	//we know that charset?
 	if(HashString<value_type>::get(ANAME))
 		return; // don't load it then