--- parser3/src/include/pa_charset.h 2002/08/01 11:41:14 1.18 +++ parser3/src/include/pa_charset.h 2003/03/31 08:05:00 1.20.2.18.2.6 @@ -1,16 +1,16 @@ /** @file Parser: Charset connection decl. - Copyright (c) 2001, 2002 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: 2002/08/01 11:41:14 $"; +static const char* IDENT_CHARSET_H="$Date: 2003/03/31 08:05:00 $"; + -#include "pa_pool.h" #include "pa_exception.h" #include "pa_common.h" @@ -26,6 +26,10 @@ namespace PCRE { // defines +#define MAX_CHARSETS 10 + +#define MAX_CHARSET_UNI_CODES 500 + # ifndef XMLCh typedef unsigned int XMLCh; # endif @@ -33,31 +37,36 @@ namespace PCRE { typedef unsigned char XMLByte; # endif +// forwards + +class GdomeDOMString_auto_ptr; + +// helpers + struct Charset_TransRec { XMLCh intCh; XMLByte extCh; }; /** charset holds name & transcode tables - registers Xerces transcoders + registers libxml transcoders */ -class Charset : public Pooled { +class Charset: public PA_Object { public: - Charset(Pool& apool, const String& aname, const String *request_file_spec); - Charset::~Charset(); + Charset(const String& aname, const String* afile_spec); 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( + 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 ); #ifdef XML - xmlCharEncodingHandler *transcoder(const String *source); + xmlCharEncodingHandler& transcoder(const String& name); #endif public: @@ -66,62 +75,76 @@ public: private: - void loadDefinition(const String& request_file_spec); + void load_definition(const String& afile_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; - void transcodeFromUTF8(Pool& pool, - 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; + void transcodeToUTF8( + const void* source_body, size_t source_content_length, + const void* & dest_body, size_t& dest_content_length) const; + void transcodeFromUTF8( + const void* source_body, size_t source_content_length, + const void* & dest_body, size_t& dest_content_length) const; + + void transcodeToCharset( + const Charset& dest_transcoder, + 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; + Charset_TransRec toTable[MAX_CHARSET_UNI_CODES]; uint toTableSize; }; private: const String& fname; + char* fname_cstr; bool fisUTF8; Tables tables; #ifdef XML private: - void addEncoding(char *name_cstr); - void initTranscoder(const String *source, const char *name_cstr); + void addEncoding(char* name_cstr); + void initTranscoder(const String& name, 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 - String& transcode(GdomeDOMString *s); - /// converts xmlChar* null-terminated string to char * - const char *transcode_cstr(xmlChar *s); + const String& transcode(GdomeDOMString* s); + /// converts xmlChar* null-terminated string to char* + const char* transcode_cstr(xmlChar* s); /// converts xmlChar* null-terminated string to parser String - String& transcode(xmlChar *s); - /** converts sized char * to xmlChar* - @returns xmlChar * which caller should free + const String& transcode(xmlChar* s); + + /** converts sized char* to xmlChar* + @returns xmlChar* WHICH CALLER SHOULD FREE + */ + xmlChar* transcode_buf2xchar(const char* buf, size_t buf_size); + /** converts sized char* to gchar* + @returns gchar* 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); + gchar* transcode_buf2gchar(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(const String& s); + /// converts parser StringBody to GdomeDOMString + GdomeDOMString_auto_ptr transcode(const StringBody s); + +private: + + typedef void* (*transcode_buf_malloc_func)(size_t size); + void* transcode_buf2mchar(transcode_buf_malloc_func malloc_func, + const char* buf, size_t buf_size); private: - xmlCharEncodingHandler *ftranscoder; + xmlCharEncodingHandler* ftranscoder; #endif @@ -130,14 +153,16 @@ private: #ifdef XML /// Auto-object used to track GdomeDOMString usage class GdomeDOMString_auto_ptr { - GdomeDOMString *fstring; + GdomeDOMString* fstring; public: - explicit GdomeDOMString_auto_ptr(gchar *astring) : fstring(gdome_str_mkref(astring)) {} - explicit GdomeDOMString_auto_ptr(GdomeDOMString *astring) : fstring(astring) { + /// frees astring afterwards!!! + explicit GdomeDOMString_auto_ptr(gchar* astring) : fstring(gdome_str_mkref_own(astring)) {} + explicit GdomeDOMString_auto_ptr(GdomeDOMString* astring=0) : fstring(astring) { // not ref-ing, owning } ~GdomeDOMString_auto_ptr() { - gdome_str_unref(fstring); + if(fstring) + gdome_str_unref(fstring); } GdomeDOMString* get() { return fstring; @@ -146,7 +171,7 @@ public: return fstring; } GdomeDOMString& operator*() { - return *fstring; + return* fstring; } // copying @@ -155,13 +180,15 @@ public: } GdomeDOMString_auto_ptr& operator =(const GdomeDOMString_auto_ptr& src) { if(this == &src) - return *this; + return* this; - gdome_str_unref(fstring); + if(fstring) + gdome_str_unref(fstring); fstring=src.fstring; - gdome_str_ref(fstring); + if(fstring) + gdome_str_ref(fstring); - return *this; + return* this; } }; #endif