[BACK]Return to pa_charsets.C CVS log [TXT] [DIR] Up to [parser3project] / parser3 / src / main

Diff for /parser3/src/main/pa_charsets.C between versions 1.11.2.3 and 1.11.2.10.2.4

version 1.11.2.3, 2003/01/28 11:46:45 version 1.11.2.10.2.4, 2003/04/08 16:11:54
Line 1 Line 1
 /** @file  /** @file
         Parser: sql driver manager implementation.          Parser: sql driver manager implementation.
   
         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 9  static const char* IDENT_CHARSETS_C="$Da Line 9  static const char* IDENT_CHARSETS_C="$Da
   
 #include "pa_charsets.h"  #include "pa_charsets.h"
   
 // statics  // defines for globals
   
   #define CHARSET_UTF8_NAME "UTF-8"
   
 // globals  // globals
   
   Charset UTF8_charset(0, *new String(CHARSET_UTF8_NAME), 0/*no file=system*/);
   
 Charsets charsets;  Charsets charsets;
   
 //  // methods
   
 Charsets::Charsets() {  Charsets::Charsets() {
         put(UTF8_charset->name(), UTF8_charset);          put(UTF8_charset.NAME(), &UTF8_charset);
 }  }
   
 CharsetPtr Charsets::get(ConstStringPtr aname) {  Charset& Charsets::get(const StringBody ANAME) {
         if(CharsetPtr result=Hash<key_type, value_type>::get(aname))          if(Charset* result=Hash<key_type, value_type>::get(ANAME))
                 return result;                  return *result;
         else          else
                 throw Exception("parser.runtime",                  throw Exception("parser.runtime",
                         aname,                          new String(ANAME, String::L_TAINTED),
                         "unknown charset");                          "unknown charset");
 }  }
   
 void Charsets::load_charset(ConstStringPtr arequest_name, ConstStringPtr arequest_file_spec) {  void Charsets::load_charset(Request_charsets& charsets, const StringBody ANAME, const String& afile_spec) {
         //we know that charset?          //we know that charset?
         if(get(arequest_name))           if(Hash<key_type, value_type>::get(ANAME)) 
                 return; // don't load it then                  return; // don't load it then
   
         // make global_name string on cache_pool pool          put(ANAME, new Charset(&charsets, ANAME, &afile_spec));
         StringPtr global_name(new String(arequest_name->cstr(charsets_pool)));  
           
         put(global_name, value_type(new Charset(global_name, arequest_file_spec)));  
 }  }
Removed from v.1.11.2.3  
changed lines
  Added in v.1.11.2.10.2.4

E-mail: