--- parser3/src/include/pa_charsets.h	2003/03/21 14:49:00	1.8.2.8.2.3
+++ parser3/src/include/pa_charsets.h	2016/09/21 15:35:10	1.19
@@ -1,7 +1,7 @@
 /** @file
 	Parser: sql driver manager decl.
 
-	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
 
@@ -11,24 +11,29 @@
 #ifndef PA_CHARSETS_H
 #define PA_CHARSETS_H
 
-static const char* IDENT_CHARSETS_H="$Date: 2003/03/21 14:49:00 $";
+#define IDENT_PA_CHARSETS_H "$Id: pa_charsets.h,v 1.19 2016/09/21 15:35:10 moko Exp $"
 
 #include "pa_hash.h"
 #include "pa_charset.h"
 
-class Charsets: public Hash<const StringBody&, Charset*> {
+/// convention: use UPPERCASE keys
+class Charsets: public HashString<Charset*> {
 public:
 
 	Charsets();
 
-	Charset& get(const String& aname);
+	Charset& get(String::Body ANAME);
+	Charset& get_direct(const char *ANAME);
 
-	void load_charset(const String& aname, const String& afile_spec);
+	void load_charset(Request_charsets& charsets, String::Body ANAME, const String& afile_spec);
+
+	// detects charset if it's not enforced, skips BOM signature if it complies charset
+	static Charset* checkBOM(char *&body,size_t &body_size, Charset* enforced_charset);
 };
 
 //@{ globals
-extern Charset UTF8_charset;
-extern Charsets charsets;
+extern Charset pa_UTF8_charset;
+extern Charsets pa_charsets;
 //@}
 
 #endif