Diff for /parser3/src/include/pa_charset.h between versions 1.20.2.6 and 1.20.2.13

version 1.20.2.6, 2003/01/28 15:16:49 version 1.20.2.13, 2003/03/06 08:21:09
Line 1 Line 1
 /** @file  /** @file
         Parser: Charset connection decl.          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 <paf@design.ru> (http://paf.design.ru)          Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */  */
   
Line 26  namespace PCRE { Line 26  namespace PCRE {
   
 // defines  // defines
   
   #define MAX_CHARSET_UNI_CODES 500
   
 #       ifndef XMLCh   #       ifndef XMLCh 
                 typedef unsigned int XMLCh;                  typedef unsigned int XMLCh;
 #       endif  #       endif
Line 42  struct Charset_TransRec { Line 44  struct Charset_TransRec {
         registers libxml transcoders          registers libxml transcoders
 */  */
 class Charset: public PA_Object {  class Charset: public PA_Object {
         Pool pool_for_load;  
 public:  public:
   
         Charset(ConstStringPtr aname, ConstStringPtr afile_spec);          Charset(StringPtr aname, StringPtr afile_spec);
         override ~Charset();          override ~Charset();
                   
         ConstStringPtr name() const { return fname; }          StringPtr name() const { return fname; }
   
         bool isUTF8() const { return fisUTF8; }          bool isUTF8() const { return fisUTF8; }
   
Line 67  public: Line 68  public:
   
 private:  private:
   
         void load_definition(ConstStringPtr afile_spec);          void load_definition(StringPtr afile_spec);
         void sort_ToTable();          void sort_ToTable();
   
         void transcodeToUTF8(Pool& pool,          void transcodeToUTF8(Pool& pool,
Line 86  public: Line 87  public:
   
         struct Tables {          struct Tables {
                 XMLCh fromTable[0x100];                  XMLCh fromTable[0x100];
                 Charset_TransRec *toTable;                  Charset_TransRec toTable[MAX_CHARSET_UNI_CODES];
                 uint toTableSize;                  uint toTableSize;
         };          };
   
 private:  private:
   
         ConstStringPtr fname;          StringPtr fname;
         CharPtr fname_cstr;          CharPtr fname_cstr;
         bool fisUTF8;          bool fisUTF8;
         Tables tables;          Tables tables;
Line 101  private: Line 102  private:
   
 private:  private:
         void addEncoding(char *name_cstr);          void addEncoding(char *name_cstr);
         void initTranscoder(const String *source, const char *name_cstr);          void initTranscoder(const String *source, const char* name_cstr);
                   
 public:  public:
         /// converts GdomeDOMString string to char *          /// converts GdomeDOMString string to char *
         const char *transcode_cstr(GdomeDOMString *s);          const char* transcode_cstr(GdomeDOMString *s);
         /// converts GdomeDOMString string to parser String          /// converts GdomeDOMString string to parser String
         String& transcode(GdomeDOMString *s          String& transcode(GdomeDOMString *s
 #ifndef NO_STRING_ORIGIN  #ifndef NO_STRING_ORIGIN
Line 113  public: Line 114  public:
 #endif  #endif
                 );                  );
         /// converts xmlChar* null-terminated string to char *          /// converts xmlChar* null-terminated string to char *
         const char *transcode_cstr(xmlChar *s);          const char* transcode_cstr(xmlChar *s);
         /// converts xmlChar* null-terminated string to parser String          /// converts xmlChar* null-terminated string to parser String
         String& transcode(xmlChar *s          String& transcode(xmlChar *s
 #ifndef NO_STRING_ORIGIN  #ifndef NO_STRING_ORIGIN
Line 123  public: Line 124  public:
         /** converts sized char * to xmlChar*          /** converts sized char * to xmlChar*
                 @returns xmlChar * which caller should free                  @returns xmlChar * which caller should free
         */          */
         xmlChar *transcode_buf2xchar(const char *buf, size_t buf_size);          xmlChar *transcode_buf2xchar(Pool& pool, const char* buf, size_t buf_size);
         /// converts char * to GdomeDOMString          /// converts char * to GdomeDOMString
         GdomeDOMString_auto_ptr transcode_buf2dom(const char *buf, size_t buf_size);          GdomeDOMString_auto_ptr transcode_buf2dom(const char* buf, size_t buf_size);
         /// converts parser String to GdomeDOMString          /// converts parser String to GdomeDOMString
         GdomeDOMString_auto_ptr transcode(const String& s);          GdomeDOMString_auto_ptr transcode(const String& s);
   
Line 136  private: Line 137  private:
 #endif  #endif
   
 };  };
   DECLARE_OBJECT_PTR(Charset);
 DECLARE_OBJECT_PTR(Charset)  
   
 extern CharsetPtr UTF8_charset;  
   
   
 struct Request_charset_info {  
         Pool *pool;  
         Charset *source;  
         Charset *client;  
         Charset *mail;  
 };  
   
   
 #ifdef XML  #ifdef XML
 /// Auto-object used to track GdomeDOMString usage  /// Auto-object used to track GdomeDOMString usage

Removed from v.1.20.2.6  
changed lines
  Added in v.1.20.2.13


E-mail: