--- parser3/src/include/pa_charset.h 2001/12/27 19:57:08 1.3 +++ parser3/src/include/pa_charset.h 2003/03/06 12:02:04 1.20.2.14 @@ -1,15 +1,15 @@ /** @file Parser: Charset connection decl. - Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://paf.design.ru) - - $Id: pa_charset.h,v 1.3 2001/12/27 19:57:08 paf Exp $ + 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 $"; + #include "pa_pool.h" #include "pa_exception.h" #include "pa_common.h" @@ -26,107 +26,159 @@ namespace PCRE { // defines -#ifdef XML -/*# include -# include -# define Charset_TransRec XMLTransService::TransRec -*/ - -# ifndef XMLCh -# define XMLCh unsigned int -# endif -# ifndef XMLByte -# define XMLByte unsigned char -# endif - - struct Charset_TransRec { - XMLCh intCh; - XMLByte extCh; - }; +#define MAX_CHARSET_UNI_CODES 500 -#else # ifndef XMLCh -# define XMLCh unsigned int + typedef unsigned int XMLCh; # endif # ifndef XMLByte -# define XMLByte unsigned char + typedef unsigned char XMLByte; # endif - struct Charset_TransRec { - XMLCh intCh; - XMLByte extCh; - }; -#endif +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(StringPtr aname, StringPtr afile_spec); + override ~Charset(); - const String& name() const { return fname; } + StringPtr 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 ); +#ifdef XML + xmlCharEncodingHandler& transcoder(StringPtr source); +#endif + public: unsigned char pcre_tables[tables_length]; private: - void loadDefinition(const String& request_file_spec); + void load_definition(StringPtr afile_spec); void sort_ToTable(); - XMLByte xlatOneTo(const XMLCh toXlat) const; 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]; + uint toTableSize; + }; private: - const String& fname; + StringPtr fname; + CharPtr fname_cstr; bool fisUTF8; - XMLCh fromTable[0x100]; - Charset_TransRec *toTable; - uint toTableSize; + Tables tables; #ifdef XML private: - void addEncoding(const char *name_cstr); - void initTranscoder(const String *source, const char *name_cstr); - + void addEncoding(char* name_cstr); + void initTranscoder(StringPtr 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 - String& transcode(GdomeDOMString *s); - /// converts char * to GdomeDOMString - GdomeDOMString *transcode_buf(const char *buf, size_t buf_size); + StringPtr transcode(GdomeDOMString* s +#ifndef NO_STRING_ORIGIN + , StringPtr origin +#endif + ); + /// converts xmlChar* null-terminated string to char* + CharPtr transcode_cstr(xmlChar* s); + /// converts xmlChar* null-terminated string to parser String + StringPtr transcode(xmlChar* s +#ifndef NO_STRING_ORIGIN + , StringPtr origin +#endif + ); + /** 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); /// converts parser String to GdomeDOMString - GdomeDOMString *transcode(const String& s); + GdomeDOMString_auto_ptr transcode(StringPtr s); private: - xmlCharEncodingHandler *transcoder; + typedef smart_ptr xmlCharEncodingHandlerPtr; + xmlCharEncodingHandlerPtr fcreated_handler; + xmlCharEncodingHandler* ftranscoder; #endif }; +DECLARE_OBJECT_PTR(Charset); + +#ifdef XML +/// Auto-object used to track GdomeDOMString usage +class GdomeDOMString_auto_ptr { + 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) { + // not ref-ing, owning + } + ~GdomeDOMString_auto_ptr() { + gdome_str_unref(fstring); + } + GdomeDOMString* get() { + return fstring; + } + GdomeDOMString* operator->() { + return fstring; + } + GdomeDOMString& operator*() { + return* fstring; + } + + // copying + GdomeDOMString_auto_ptr(const GdomeDOMString_auto_ptr& src) : fstring(src.fstring) { + gdome_str_ref(fstring); + } + GdomeDOMString_auto_ptr& operator =(const GdomeDOMString_auto_ptr& src) { + if(this == &src) + return* this; + + gdome_str_unref(fstring); + fstring=src.fstring; + gdome_str_ref(fstring); + + return* this; + } +}; +#endif #endif