Diff for /parser3/src/main/pa_globals.C between versions 1.56.2.3 and 1.98

version 1.56.2.3, 2001/04/28 07:27:41 version 1.98, 2001/12/28 14:52:40
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$          $Id$
 */  */
Line 12 Line 11
 #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_dictionary.h"
   //#include "pa_stylesheet_manager.h"
   #include "pa_sapi.h"
   #include "pa_cache_managers.h"
   #include "pa_charsets.h"
   #include "pa_charset.h"
   
   #ifdef DB2
   #include "pa_db_manager.h"
   #endif
   
   #ifdef XML
   //#include "libxml/parser.h"
   //#include "libxslt/xslt.h"
   //#include "libxslt/libxslt.h"
   #include "libxslt/extensions.h"
   #include "libexslt/exslt.h"
   #endif
   
 String *user_html_name;  
 String *content_type_name;  String *content_type_name;
   String *charset_name;
 String *body_name;  String *body_name;
 String *value_name;  String *value_name;
 String *expires_name;  String *expires_name;
Line 30  String *content_disposition_name; Line 47  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 38  String *main_method_name; Line 54  String *main_method_name;
 String *main_class_name;  String *main_class_name;
   
 String *result_var_name;  String *result_var_name;
   String *match_var_name;
 String *string_pre_match_name;  String *string_pre_match_name;
 String *string_match_name;  String *string_match_name;
 String *string_post_match_name;  String *string_post_match_name;
   
 String *limits_name;  String *charsets_name;
 String *post_max_size_name;  
   
 String *defaults_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 *mail_name;  String *origins_mode_name;
   
   String *class_path_name;
   
   String *switch_data_name;
   String *case_default_value;
   
   String *sql_limit_name;
   String *sql_offset_name;
   String *sql_default_name;
   
   String *charset_UTF8_name;
   
 String *main_sql_name;  String *hash_default_element_name;
 String *main_sql_drivers_name;  
   
 Hash *untaint_lang_name2enum;  Hash *untaint_lang_name2enum;
   
 Table *default_typo_table;  GdomeDOMImplementation *domimpl;
   
   Charset *utf8_charset;
   
 short hex_value[0x100];  short hex_value[0x100];
   
 static void setup_hex_value() {  static void setup_hex_value() {
         int i;          memset(hex_value, 0, sizeof(hex_value));
         for (i=0; (i < 0x100); i++) {  
                 hex_value[i] = 0;  
         }  
         hex_value['0'] = 0;               hex_value['0'] = 0;     
         hex_value['1'] = 1;               hex_value['1'] = 1;     
         hex_value['2'] = 2;               hex_value['2'] = 2;     
Line 95  static void setup_hex_value() { Line 111  static void setup_hex_value() {
         hex_value['f'] = 15;          hex_value['f'] = 15;
 }  }
   
   void pa_globals_destroy(void *) {
           try {
   #ifdef XML
                   GdomeException exc;
                   gdome_di_unref (domimpl, &exc);
   #endif
                   if(cache_managers)
                           cache_managers->~Cache_managers();
   
                   charsets->~Charsets();
                   
           } 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 103  void pa_globals_init(Pool& pool) { Line 138  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);
         body_name=NEW String(pool, BODY_NAME);          body_name=NEW String(pool, BODY_NAME);
         value_name=NEW String(pool, VALUE_NAME);          value_name=NEW String(pool, VALUE_NAME);
         expires_name=NEW String(pool, EXPIRES_NAME);          expires_name=NEW String(pool, EXPIRES_NAME);
Line 120  void pa_globals_init(Pool& pool) { Line 155  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 128  void pa_globals_init(Pool& pool) { Line 162  void pa_globals_init(Pool& pool) {
         main_class_name=NEW String(pool, MAIN_CLASS_NAME);          main_class_name=NEW String(pool, MAIN_CLASS_NAME);
   
         result_var_name=NEW String(pool, RESULT_VAR_NAME);          result_var_name=NEW String(pool, RESULT_VAR_NAME);
           match_var_name=NEW String(pool, MATCH_VAR_NAME);
         string_pre_match_name=NEW String(pool, STRING_PRE_MATCH_NAME);          string_pre_match_name=NEW String(pool, STRING_PRE_MATCH_NAME);
         string_match_name=NEW String(pool, STRING_MATCH_NAME);          string_match_name=NEW String(pool, STRING_MATCH_NAME);
         string_post_match_name=NEW String(pool, STRING_POST_MATCH_NAME);          string_post_match_name=NEW String(pool, STRING_POST_MATCH_NAME);
   
   
         limits_name=NEW String(pool, LIMITS_NAME);          charsets_name=NEW String(pool, CHARSETS_NAME);
         post_max_size_name=NEW String(pool, POST_MAX_SIZE_NAME);  
   
         defaults_name=NEW String(pool, DEFAULTS_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);
         mail_name=NEW String(pool, MAIL_NAME);          origins_mode_name=NEW String(pool, ORIGINS_MODE_NAME);
           
           class_path_name=NEW String(pool, CLASS_PATH_NAME);
   
           //^switch ^case
           switch_data_name=NEW String(pool, SWITCH_DATA_NAME);
           case_default_value=NEW String(pool, CASE_DEFAULT_VALUE);
   
           // sql
           sql_limit_name=NEW String(pool, SQL_LIMIT_NAME);
           sql_offset_name=NEW String(pool, SQL_OFFSET_NAME);
           sql_default_name=NEW String(pool, SQL_DEFAULT_NAME);
   
           // charsets
           charset_UTF8_name=NEW String(pool, CHARSET_UTF8_NAME);
   
           // hash
           hash_default_element_name=NEW String(pool, HASH_DEFAULT_ELEMENT_NAME);
   
         main_sql_name=NEW String(pool, MAIN_SQL_NAME);  
         main_sql_drivers_name=NEW String(pool, MAIN_SQL_DRIVERS_NAME);  
   
         // hashes          // hashes
         untaint_lang_name2enum=NEW Hash(pool);          untaint_lang_name2enum=NEW Hash(pool);
         String as_is(pool, "as-is");            #define ULN(cstr, LANG) \
         untaint_lang_name2enum->put(as_is, (int)String::UL_AS_IS);                  untaint_lang_name2enum->put(*NEW String(pool, cstr), (int)String::UL_##LANG);
         String file_name(pool, "file-name");            ULN("as-is", AS_IS);
         untaint_lang_name2enum->put(file_name, (int)String::UL_FILE_NAME);          ULN("file-spec", FILE_SPEC);
         String http_header(pool, "http-header");            ULN("http-header", HTTP_HEADER);
         untaint_lang_name2enum->put(http_header, (int)String::UL_HTTP_HEADER);          ULN("mail-header", MAIL_HEADER);
         String mail_header(pool, "mail-header");            ULN("uri", URI);
         untaint_lang_name2enum->put(mail_header, (int)String::UL_MAIL_HEADER);          ULN("table", TABLE);
         String uri(pool, "uri");            ULN("sql", SQL);
         untaint_lang_name2enum->put(uri, (int)String::UL_URI);          ULN("js", JS);
         String table(pool, "table");          ULN("xml", XML);
         untaint_lang_name2enum->put(table, (int)String::UL_TABLE);          ULN("html", HTML);
         String sql(pool, "sql");          ULN("optimized-html", HTML|String::UL_OPTIMIZE_BIT);
         untaint_lang_name2enum->put(sql, (int)String::UL_SQL);  
         String js(pool, "js");          // charsets
         untaint_lang_name2enum->put(js, (int)String::UL_JS);          charsets=NEW Charsets(pool);
         String html(pool, "html");          charsets->put(*charset_UTF8_name, 
         untaint_lang_name2enum->put(html, (int)String::UL_HTML);                  utf8_charset=NEW Charset(pool, *charset_UTF8_name, 0/*no file=system*/));
         String html_typo(pool, "html-typo");  
         untaint_lang_name2enum->put(html_typo, (int)String::UL_HTML_TYPO);          // Status registration, must be initialized before all registrants
           cache_managers=NEW Cache_managers(pool);
         // tables  
         default_typo_table=NEW Table(pool, 0, 0);          // SQL driver manager
         #define DT_ROW(from, to) { \          cache_managers->put(*NEW String(pool, "sql"), 
                         Array *row=NEW Array(pool); \                  SQL_driver_manager=NEW SQL_Driver_manager(pool));
                         *row+=NEW String(pool, from); \  
                         *row+=NEW String(pool, to); \  #ifdef DB2
                         *default_typo_table+=row; \          // DB driver manager
                 }          cache_managers->put(*NEW String(pool, "db"), 
         DT_ROW("<", "&lt;");                  DB_manager=NEW DB_Manager(pool));
         DT_ROW(">", "&gt;");  #endif
         DT_ROW("\"", "&quot;");  
         DT_ROW("&", "&amp;");  #ifdef XML
         DT_ROW("\\n\\n", "<p>");          // initializing xml libs
         DT_ROW("\\n", "<br>");  
           /* First I get a DOMImplementation reference */
         // SQL_Driver_manager          domimpl = gdome_di_mkref ();
         SQL_driver_manager=NEW SQL_Driver_manager(pool);      /*
        * Register the EXSLT extensions and the test module
        */
       exsltRegisterAll();
       xsltRegisterTestModule();
       xmlDefaultSAXHandlerInit();
       /*
        * disable CDATA from being built in the document tree
        */
       xmlDefaultSAXHandler.cdataBlock = NULL;
   
   /*
           // XSLT stylesheet manager
           cache_managers->put(*NEW String(pool, "stylesheet"), 
                   stylesheet_manager=NEW Stylesheet_manager(pool));
                   */
   #endif
 }  }
   
   #if defined(XML) && defined(_MSC_VER)
   #       define XML_LIBS "/parser3project/win32xml"
   #       pragma comment(lib, XML_LIBS "/glib/lib/libglib-1.3-11.lib")
   #       pragma comment(lib, XML_LIBS "/libxml2-2.4.12/win32/dsp/libxml2_so/libxml2.lib")
   #       pragma comment(lib, XML_LIBS "/libxslt-1.0.9/win32/dsp/libexslt_so/libexslt.lib")
   #       pragma comment(lib, XML_LIBS "/libxslt-1.0.9/win32/dsp/libxslt_a/libxslt.lib")
   #       ifdef _DEBUG
   #               pragma comment(lib, XML_LIBS "/gdome2-0.7.0/win32/dsp/Debug/libgdome.lib")
   #       else
   #               pragma comment(lib, XML_LIBS "/gdome2-0.7.0/win32/dsp/Release/libgdome.lib")
   #       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.56.2.3  
changed lines
  Added in v.1.98


E-mail: