Diff for /parser3/src/main/pa_globals.C between versions 1.76 and 1.94

version 1.76, 2001/09/21 14:46:09 version 1.94, 2001/12/14 13:02:32
Line 2 Line 2
         Parser: globals.          Parser: globals.
   
         Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)          Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
           Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
   
         Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)          $Id$
 */  */
 static const char *RCSId="$Id$";   
   
 #include "pa_globals.h"  #include "pa_globals.h"
 #include "pa_string.h"  #include "pa_string.h"
 #include "pa_hash.h"  #include "pa_hash.h"
 #include "pa_sql_driver_manager.h"  #include "pa_sql_driver_manager.h"
 #include "pa_xslt_stylesheet_manager.h"  
 #include "pa_dictionary.h"  #include "pa_dictionary.h"
   #include "pa_stylesheet_manager.h"
   #include "pa_charset_manager.h"
   #include "pa_sapi.h"
   #include "pa_cache_managers.h"
   
 #ifdef XML  #ifdef DB2
 #include <util/PlatformUtils.hpp>  #include "pa_db_manager.h"
 #include <XalanTransformer/XalanTransformer.hpp>  
 #endif  #endif
   
 String *user_html_name;  
 String *content_type_name;  String *content_type_name;
 String *charset_name;  String *charset_name;
 String *body_name;  String *body_name;
Line 37  String *content_disposition_name; Line 38  String *content_disposition_name;
 String *content_disposition_filename_name;  String *content_disposition_filename_name;
   
 String *unnamed_name;  String *unnamed_name;
 String *empty_string;  
   
 String *auto_method_name;  String *auto_method_name;
 String *main_method_name;  String *main_method_name;
Line 50  String *string_pre_match_name; Line 50  String *string_pre_match_name;
 String *string_match_name;  String *string_match_name;
 String *string_post_match_name;  String *string_post_match_name;
   
 String *defaults_name;  String *charsets_name;
 String *ctype_name;  
 String *ctype_white_space_name;  
 String *ctype_digit_name;  
 String *ctype_hex_digit_name;  
 String *ctype_letter_name;  
 String *ctype_word_name;  
 String *ctype_lowercase_name;  
 String *mime_types_name;  String *mime_types_name;
 String *vfile_mime_type_name;  String *vfile_mime_type_name;
 String *origins_mode_name;  String *origins_mode_name;
Line 105  static void setup_hex_value() { Line 98  static void setup_hex_value() {
         hex_value['f'] = 15;          hex_value['f'] = 15;
 }  }
   
   void pa_globals_destroy(void *) {
           try {
                   if(cache_managers)
                           cache_managers->~Cache_managers();
                   
           } catch(const Exception& e) {
                   SAPI::die("pa_globals_destroy failed: %s", e.comment());
           }
   }
   
   
 void pa_globals_init(Pool& pool) {  void pa_globals_init(Pool& pool) {
           pool.register_cleanup(pa_globals_destroy, 0);
   
         #undef NEW          #undef NEW
         #define NEW new(pool)          #define NEW new(pool)
   
Line 113  void pa_globals_init(Pool& pool) { Line 119  void pa_globals_init(Pool& pool) {
         setup_hex_value();          setup_hex_value();
   
         // names          // names
         user_html_name=NEW String(pool, USER_HTML_NAME);  
         content_type_name=NEW String(pool, CONTENT_TYPE_NAME);          content_type_name=NEW String(pool, CONTENT_TYPE_NAME);
         charset_name=NEW String(pool, CHARSET_NAME);          charset_name=NEW String(pool, CHARSET_NAME);
         body_name=NEW String(pool, BODY_NAME);          body_name=NEW String(pool, BODY_NAME);
Line 131  void pa_globals_init(Pool& pool) { Line 136  void pa_globals_init(Pool& pool) {
         content_disposition_filename_name=NEW String(pool, CONTENT_DISPOSITION_FILENAME_NAME);          content_disposition_filename_name=NEW String(pool, CONTENT_DISPOSITION_FILENAME_NAME);
   
         unnamed_name=NEW String(pool, UNNAMED_NAME);          unnamed_name=NEW String(pool, UNNAMED_NAME);
         empty_string=NEW String(pool);   
   
         auto_method_name=NEW String(pool, AUTO_METHOD_NAME);          auto_method_name=NEW String(pool, AUTO_METHOD_NAME);
         main_method_name=NEW String(pool, MAIN_METHOD_NAME);          main_method_name=NEW String(pool, MAIN_METHOD_NAME);
Line 145  void pa_globals_init(Pool& pool) { Line 149  void pa_globals_init(Pool& pool) {
         string_post_match_name=NEW String(pool, STRING_POST_MATCH_NAME);          string_post_match_name=NEW String(pool, STRING_POST_MATCH_NAME);
   
   
         defaults_name=NEW String(pool, DEFAULTS_NAME);          charsets_name=NEW String(pool, CHARSETS_NAME);
         ctype_name=NEW String(pool, CTYPE_NAME);  
         ctype_white_space_name=NEW String(pool, CTYPE_WHITE_SPACE_NAME);  
         ctype_digit_name=NEW String(pool, CTYPE_DIGIT_NAME);  
         ctype_hex_digit_name=NEW String(pool, CTYPE_HEX_DIGIT_NAME);  
         ctype_letter_name=NEW String(pool, CTYPE_LETTER_NAME);  
         ctype_word_name=NEW String(pool, CTYPE_WORD_NAME);  
         ctype_lowercase_name=NEW String(pool, CTYPE_LOWERCASE_NAME);  
         mime_types_name=NEW String(pool, MIME_TYPES_NAME);          mime_types_name=NEW String(pool, MIME_TYPES_NAME);
         vfile_mime_type_name=NEW String(pool, VFILE_MIME_TYPE_NAME);          vfile_mime_type_name=NEW String(pool, VFILE_MIME_TYPE_NAME);
         origins_mode_name=NEW String(pool, ORIGINS_MODE_NAME);          origins_mode_name=NEW String(pool, ORIGINS_MODE_NAME);
Line 174  void pa_globals_init(Pool& pool) { Line 171  void pa_globals_init(Pool& pool) {
   
         // hashes          // hashes
         untaint_lang_name2enum=NEW Hash(pool);          untaint_lang_name2enum=NEW Hash(pool);
         #define ULN(var, cstr, LANG) \          #define ULN(cstr, LANG) \
                 String var(pool, cstr); \                  untaint_lang_name2enum->put(*NEW String(pool, cstr), (int)String::UL_##LANG);
                 untaint_lang_name2enum->put(var, (int)String::UL_##LANG);          ULN("as-is", AS_IS);
         ULN(as_is, "as-is", AS_IS);          ULN("file-spec", FILE_SPEC);
         ULN(file_name, "file-spec", FILE_SPEC);          ULN("http-header", HTTP_HEADER);
         ULN(http_header, "http-header", HTTP_HEADER);          ULN("mail-header", MAIL_HEADER);
         ULN(mail_header, "mail-header", MAIL_HEADER);          ULN("uri", URI);
         ULN(uri, "uri", URI);          ULN("table", TABLE);
         ULN(table, "table", TABLE);          ULN("sql", SQL);
         ULN(sql, "sql", SQL);          ULN("js", JS);
         ULN(js, "js", JS);          ULN("xml", XML);
         ULN(xml, "xml", XML);          ULN("html", HTML);
         ULN(html, "html", HTML);          ULN("optimized-html", HTML|String::UL_OPTIMIZE_BIT);
         ULN(user_html, "user-html", USER_HTML);  
   
         // tables          // tables
         Table *default_typo_table=NEW Table(pool, 0, 0);          Table *default_typo_table=NEW Table(pool, 0, 0);
Line 205  void pa_globals_init(Pool& pool) { Line 201  void pa_globals_init(Pool& pool) {
         DT_ROW("\\n", "<br>");          DT_ROW("\\n", "<br>");
         default_typo_dict=NEW Dictionary(*default_typo_table);          default_typo_dict=NEW Dictionary(*default_typo_table);
   
         // SQL driver manager          // Status registration, must be initialized before all registrants
         SQL_driver_manager=NEW SQL_Driver_manager(pool);          cache_managers=NEW Cache_managers(pool);
   
 #ifdef XML          // SQL driver manager
         // Xerces & Xalan          cache_managers->put(*NEW String(pool, "sql"), 
                   SQL_driver_manager=NEW SQL_Driver_manager(pool));
   
         // Use the static initializers to initialize the Xalan-C++ and Xerces-C++ platforms.   #ifdef DB2
         // You must initialize Xerces-C++ once per process          // DB driver manager
         XMLPlatformUtils::Initialize();          cache_managers->put(*NEW String(pool, "db"), 
         XalanTransformer::initialize();                  DB_manager=NEW DB_Manager(pool));
   #endif
   
   #ifdef XML
         // XSLT stylesheet driver manager          // XSLT stylesheet driver manager
         XSLT_stylesheet_manager=NEW XSLT_Stylesheet_manager(pool);          cache_managers->put(*NEW String(pool, "stylesheet"), 
                   stylesheet_manager=NEW Stylesheet_manager(pool));
 #endif  #endif
   
           // Charset manager 
           cache_managers->put(*NEW String(pool, "charset"), 
                   charset_manager=NEW Charset_manager(pool));
 }  }
   
 #if defined(XML) && defined(_MSC_VER)  #if defined(XML) && defined(_MSC_VER)
Line 248  void pa_globals_init(Pool& pool) { Line 252  void pa_globals_init(Pool& pool) {
 #               pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Release/XSLT.lib")  #               pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Release/XSLT.lib")
 #       endif  #       endif
 #endif  #endif
   
   
   #if defined(DB2) && defined(_MSC_VER)
   #       define LIBDB2_WIN32_BUILD "/parser3project/win32db/lib"
   #       ifdef _DEBUG
   #               pragma comment(lib, LIBDB2_WIN32_BUILD "/debug/libdb.lib")
   #       else
   #               pragma comment(lib, LIBDB2_WIN32_BUILD "/release/libdb.lib")
   #       endif
   #endif
   

Removed from v.1.76  
changed lines
  Added in v.1.94


E-mail: