--- parser3/src/include/pa_charsets.h 2005/08/05 13:02:58 1.12.14.1 +++ parser3/src/include/pa_charsets.h 2020/12/15 17:10:30 1.21 @@ -1,7 +1,7 @@ /** @file Parser: sql driver manager decl. - Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2020 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) @@ -11,25 +11,29 @@ #ifndef PA_CHARSETS_H #define PA_CHARSETS_H -static const char * const IDENT_CHARSETS_H="$Date: 2005/08/05 13:02:58 $"; +#define IDENT_PA_CHARSETS_H "$Id: pa_charsets.h,v 1.21 2020/12/15 17:10:30 moko Exp $" #include "pa_hash.h" #include "pa_charset.h" /// convention: use UPPERCASE keys -class Charsets: public Hash { +class Charsets: public HashString { public: Charsets(); - Charset& get(const String::Body ANAME); + Charset& get(String::Body ANAME); + Charset& get_direct(const char *ANAME); - void load_charset(Request_charsets& charsets, const String::Body 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