--- parser3/src/include/pa_charset.h 2003/03/31 08:05:00 1.20.2.18.2.6 +++ parser3/src/include/pa_charset.h 2003/04/11 09:58:10 1.22 @@ -1,16 +1,16 @@ /** @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/31 08:05:00 $"; - +static const char* IDENT_CHARSET_H="$Date: 2003/04/11 09:58:10 $"; +#include "pa_pool.h" #include "pa_exception.h" #include "pa_common.h" @@ -26,10 +26,6 @@ namespace PCRE { // defines -#define MAX_CHARSETS 10 - -#define MAX_CHARSET_UNI_CODES 500 - # ifndef XMLCh typedef unsigned int XMLCh; # endif @@ -37,36 +33,46 @@ 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 libxml transcoders + registers Xerces transcoders */ -class Charset: public PA_Object { +class Charset : public Pooled { public: - Charset(const String& aname, const String* afile_spec); + Charset(Pool& apool, const String& aname, const String *request_file_spec); + Charset::~Charset(); const String& name() const { return fname; } bool isUTF8() const { return fisUTF8; } - 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 + 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(const String& name); + xmlCharEncodingHandler *transcoder(const String *source); #endif public: @@ -75,76 +81,70 @@ public: private: - void load_definition(const String& afile_spec); + void loadDefinition(const String& request_file_spec); void sort_ToTable(); - 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; + 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; public: struct Tables { XMLCh fromTable[0x100]; - Charset_TransRec toTable[MAX_CHARSET_UNI_CODES]; + Charset_TransRec *toTable; 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& name, 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 - const String& transcode(GdomeDOMString* s); - /// converts xmlChar* null-terminated string to char* - const char* transcode_cstr(xmlChar* s); + String& transcode(GdomeDOMString *s +#ifndef NO_STRING_ORIGIN + , const String *origin +#endif + ); + /// converts xmlChar* null-terminated string to char * + const char *transcode_cstr(xmlChar *s); /// converts xmlChar* null-terminated string to parser String - 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 + String& transcode(xmlChar *s +#ifndef NO_STRING_ORIGIN + , const String *origin +#endif + ); + /** converts sized char * to xmlChar* + @returns xmlChar * which caller should free */ - 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); + 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(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 @@ -153,26 +153,29 @@ private: #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=0) : 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() { - if(fstring) - gdome_str_unref(fstring); + gdome_str_unref(fstring); } - GdomeDOMString* get() { +/* GdomeDOMString* get() { + return fstring; + }*/ + GdomeDOMString* use() { + if(fstring) + gdome_str_ref(fstring); return fstring; } GdomeDOMString* operator->() { return fstring; } - GdomeDOMString& operator*() { - return* fstring; - } +/* GdomeDOMString& operator*() { + return *fstring; + }*/ // copying GdomeDOMString_auto_ptr(const GdomeDOMString_auto_ptr& src) : fstring(src.fstring) { @@ -180,7 +183,7 @@ public: } GdomeDOMString_auto_ptr& operator =(const GdomeDOMString_auto_ptr& src) { if(this == &src) - return* this; + return *this; if(fstring) gdome_str_unref(fstring); @@ -188,7 +191,7 @@ public: if(fstring) gdome_str_ref(fstring); - return* this; + return *this; } }; #endif