--- parser3/src/main/pa_globals.C 2001/09/21 15:35:45 1.77 +++ parser3/src/main/pa_globals.C 2001/11/05 11:46:28 1.89 @@ -2,21 +2,23 @@ Parser: globals. Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexander Petrosyan (http://paf.design.ru) - Author: Alexander Petrosyan (http://design.ru/paf) + $Id: pa_globals.C,v 1.89 2001/11/05 11:46:28 paf Exp $ */ -static const char *RCSId="$Id: pa_globals.C,v 1.77 2001/09/21 15:35:45 parser Exp $"; #include "pa_globals.h" #include "pa_string.h" #include "pa_hash.h" #include "pa_sql_driver_manager.h" #include "pa_dictionary.h" -#include "pa_xslt_stylesheet_manager.h" +#include "pa_stylesheet_manager.h" +#include "pa_charset_manager.h" +#include "pa_sapi.h" +#include "pa_status_provider.h" -#ifdef XML -#include -#include +#ifdef DB2 +#include "pa_db_manager.h" #endif String *user_html_name; @@ -37,7 +39,6 @@ String *content_disposition_name; String *content_disposition_filename_name; String *unnamed_name; -String *empty_string; String *auto_method_name; String *main_method_name; @@ -51,13 +52,7 @@ String *string_match_name; String *string_post_match_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 *charsets_name; String *mime_types_name; String *vfile_mime_type_name; String *origins_mode_name; @@ -105,7 +100,37 @@ static void setup_hex_value() { hex_value['f'] = 15; } +void pa_globals_destroy(void *) { + try { + // SQL driver manager + if(SQL_driver_manager) + SQL_driver_manager->~SQL_Driver_manager(); + +#ifdef DB2 + // DB driver manager + if(DB_manager) + DB_manager->~DB_Manager(); +#endif + +#ifdef XML + // XSLT stylesheet driver manager + if(stylesheet_manager) + stylesheet_manager->~Stylesheet_manager(); +#endif + + // Charset manager + if(charset_manager) + charset_manager->~Charset_manager(); + + } catch(const Exception& e) { + SAPI::die("pa_globals_destroy failed: %s", e.comment()); + } +} + + void pa_globals_init(Pool& pool) { + pool.register_cleanup(pa_globals_destroy, 0); + #undef NEW #define NEW new(pool) @@ -131,7 +156,6 @@ void pa_globals_init(Pool& pool) { content_disposition_filename_name=NEW String(pool, CONTENT_DISPOSITION_FILENAME_NAME); unnamed_name=NEW String(pool, UNNAMED_NAME); - empty_string=NEW String(pool); auto_method_name=NEW String(pool, AUTO_METHOD_NAME); main_method_name=NEW String(pool, MAIN_METHOD_NAME); @@ -146,13 +170,7 @@ void pa_globals_init(Pool& pool) { 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); + charsets_name=NEW String(pool, CHARSETS_NAME); mime_types_name=NEW String(pool, MIME_TYPES_NAME); vfile_mime_type_name=NEW String(pool, VFILE_MIME_TYPE_NAME); origins_mode_name=NEW String(pool, ORIGINS_MODE_NAME); @@ -174,20 +192,19 @@ void pa_globals_init(Pool& pool) { // hashes untaint_lang_name2enum=NEW Hash(pool); - #define ULN(var, cstr, LANG) \ - String var(pool, cstr); \ - untaint_lang_name2enum->put(var, (int)String::UL_##LANG); - ULN(as_is, "as-is", AS_IS); - ULN(file_name, "file-spec", FILE_SPEC); - ULN(http_header, "http-header", HTTP_HEADER); - ULN(mail_header, "mail-header", MAIL_HEADER); - ULN(uri, "uri", URI); - ULN(table, "table", TABLE); - ULN(sql, "sql", SQL); - ULN(js, "js", JS); - ULN(xml, "xml", XML); - ULN(html, "html", HTML); - ULN(user_html, "user-html", USER_HTML); + #define ULN(cstr, LANG) \ + untaint_lang_name2enum->put(*NEW String(pool, cstr), (int)String::UL_##LANG); + ULN("as-is", AS_IS); + ULN("file-spec", FILE_SPEC); + ULN("http-header", HTTP_HEADER); + ULN("mail-header", MAIL_HEADER); + ULN("uri", URI); + ULN("table", TABLE); + ULN("sql", SQL); + ULN("js", JS); + ULN("xml", XML); + ULN("html", HTML); + ULN("user-html", USER_HTML); // tables Table *default_typo_table=NEW Table(pool, 0, 0); @@ -205,20 +222,25 @@ void pa_globals_init(Pool& pool) { DT_ROW("\\n", "
"); default_typo_dict=NEW Dictionary(*default_typo_table); + // Status registration, must be initialized before all registrants + status_providers=NEW Status_providers(pool); + + // SQL driver manager SQL_driver_manager=NEW SQL_Driver_manager(pool); -#ifdef XML - // Xerces & Xalan - - // Use the static initializers to initialize the Xalan-C++ and Xerces-C++ platforms. - // You must initialize Xerces-C++ once per process - XMLPlatformUtils::Initialize(); - XalanTransformer::initialize(); +#ifdef DB2 + // DB driver manager + DB_manager=NEW DB_Manager(pool); +#endif +#ifdef XML // XSLT stylesheet driver manager - XSLT_stylesheet_manager=NEW XSLT_Stylesheet_manager(pool); + stylesheet_manager=NEW Stylesheet_manager(pool); #endif + + // Charset manager + charset_manager=NEW Charset_manager(pool); } #if defined(XML) && defined(_MSC_VER) @@ -248,3 +270,14 @@ void pa_globals_init(Pool& pool) { # pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Release/XSLT.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 +