--- parser3/src/include/pa_charset.h 2003/03/06 12:02:04 1.20.2.14 +++ parser3/src/include/pa_charset.h 2003/03/21 09:43:48 1.21 @@ -1,14 +1,14 @@ /** @file Parser: Charset connection decl. - Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ #ifndef PA_CHARSET_H #define PA_CHARSET_H -static const char* IDENT_CHARSET_H="$Date: 2003/03/06 12:02:04 $"; +static const char* IDENT_CHARSET_H="$Date: 2003/03/21 09:43:48 $"; #include "pa_pool.h" #include "pa_exception.h" @@ -26,8 +26,6 @@ namespace PCRE { // defines -#define MAX_CHARSET_UNI_CODES 500 - # ifndef XMLCh typedef unsigned int XMLCh; # endif @@ -41,25 +39,40 @@ struct Charset_TransRec { }; /** charset holds name & transcode tables - registers libxml transcoders + registers Xerces transcoders */ -class Charset: public PA_Object { +class Charset : public Pooled { public: - Charset(StringPtr aname, StringPtr afile_spec); - override ~Charset(); + Charset(Pool& apool, const String& aname, const String *request_file_spec); + Charset::~Charset(); - StringPtr name() const { return fname; } + const String& name() const { return fname; } bool isUTF8() const { return fisUTF8; } - static void transcode(Pool& pool, - const Charset& source_transcoder, const void* source_body, size_t source_content_length, - const Charset& dest_transcoder, const void* & dest_body, size_t& dest_content_length + static void transcode(Pool& pool, + const Charset& source_transcoder, const void *source_body, size_t source_content_length, + const Charset& dest_transcoder, const void *& dest_body, size_t& dest_content_length ); + static String& transcode(Pool& pool, + const Charset& source_transcoder, + const Charset& dest_transcoder, + const String& src); + + static void transcode(Pool& pool, + const Charset& source_transcoder, + const Charset& dest_transcoder, + Array& src); + + static void transcode(Pool& pool, + const Charset& source_transcoder, + const Charset& dest_transcoder, + Hash& src); + #ifdef XML - xmlCharEncodingHandler& transcoder(StringPtr source); + xmlCharEncodingHandler *transcoder(const String *source); #endif public: @@ -68,87 +81,82 @@ public: private: - void load_definition(StringPtr afile_spec); + void loadDefinition(const String& request_file_spec); void sort_ToTable(); void transcodeToUTF8(Pool& pool, - const void* source_body, size_t source_content_length, - const void* & dest_body, size_t& dest_content_length) const; + const void *source_body, size_t source_content_length, + const void *& dest_body, size_t& dest_content_length) const; void transcodeFromUTF8(Pool& pool, - const void* source_body, size_t source_content_length, - const void* & dest_body, size_t& dest_content_length) const; + const void *source_body, size_t source_content_length, + const void *& dest_body, size_t& dest_content_length) const; void transcodeToCharset(Pool& pool, const Charset& dest_transcoder, - const void* source_body, size_t source_content_length, - const void*& dest_body, size_t& dest_content_length) const; + const void *source_body, size_t source_content_length, + const void *& dest_body, size_t& dest_content_length) const; public: struct Tables { XMLCh fromTable[0x100]; - Charset_TransRec toTable[MAX_CHARSET_UNI_CODES]; + Charset_TransRec *toTable; uint toTableSize; }; private: - StringPtr fname; - CharPtr fname_cstr; + const String& fname; bool fisUTF8; Tables tables; #ifdef XML private: - void addEncoding(char* name_cstr); - void initTranscoder(StringPtr source, const char* name_cstr); + void addEncoding(char *name_cstr); + void initTranscoder(const String *source, const char *name_cstr); public: - /// converts GdomeDOMString string to char* - const char* transcode_cstr(GdomeDOMString* s); + /// converts GdomeDOMString string to char * + const char *transcode_cstr(GdomeDOMString *s); /// converts GdomeDOMString string to parser String - StringPtr transcode(GdomeDOMString* s + String& transcode(GdomeDOMString *s #ifndef NO_STRING_ORIGIN - , StringPtr origin + , const String *origin #endif ); - /// converts xmlChar* null-terminated string to char* - CharPtr transcode_cstr(xmlChar* s); + /// converts xmlChar* null-terminated string to char * + const char *transcode_cstr(xmlChar *s); /// converts xmlChar* null-terminated string to parser String - StringPtr transcode(xmlChar* s + String& transcode(xmlChar *s #ifndef NO_STRING_ORIGIN - , StringPtr origin + , const String *origin #endif ); - /** converts sized char* to xmlChar* - @returns xmlChar* WHICH CALLER SHOULD FREE + /** converts sized char * to xmlChar* + @returns xmlChar * which caller should free */ - xmlChar* transcode_buf2xchar(const char* buf, size_t buf_size); - /// converts char* to GdomeDOMString - GdomeDOMString_auto_ptr transcode_buf2dom(const char* buf, size_t buf_size); + xmlChar *transcode_buf2xchar(const char *buf, size_t buf_size); + /// converts char * to GdomeDOMString + GdomeDOMString_auto_ptr transcode_buf2dom(const char *buf, size_t buf_size); /// converts parser String to GdomeDOMString - GdomeDOMString_auto_ptr transcode(StringPtr s); + GdomeDOMString_auto_ptr transcode(const String& s); private: - typedef smart_ptr xmlCharEncodingHandlerPtr; - xmlCharEncodingHandlerPtr fcreated_handler; - xmlCharEncodingHandler* ftranscoder; + xmlCharEncodingHandler *ftranscoder; #endif }; -DECLARE_OBJECT_PTR(Charset); #ifdef XML /// Auto-object used to track GdomeDOMString usage class GdomeDOMString_auto_ptr { - GdomeDOMString* fstring; + GdomeDOMString *fstring; public: - /// frees astring afterwards!!! - explicit GdomeDOMString_auto_ptr(gchar* astring) : fstring(gdome_str_mkref_own(astring)) {} - explicit GdomeDOMString_auto_ptr(GdomeDOMString* astring) : fstring(astring) { + explicit GdomeDOMString_auto_ptr(gchar *astring) : fstring(gdome_str_mkref(astring)) {} + explicit GdomeDOMString_auto_ptr(GdomeDOMString *astring) : fstring(astring) { // not ref-ing, owning } ~GdomeDOMString_auto_ptr() { @@ -161,7 +169,7 @@ public: return fstring; } GdomeDOMString& operator*() { - return* fstring; + return *fstring; } // copying @@ -170,13 +178,13 @@ public: } GdomeDOMString_auto_ptr& operator =(const GdomeDOMString_auto_ptr& src) { if(this == &src) - return* this; + return *this; gdome_str_unref(fstring); fstring=src.fstring; gdome_str_ref(fstring); - return* this; + return *this; } }; #endif