--- parser3/src/main/pa_globals.C 2001/10/27 13:00:10 1.86 +++ parser3/src/main/pa_globals.C 2001/11/05 11:46:28 1.89 @@ -2,9 +2,9 @@ Parser: globals. Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://design.ru/paf) + Author: Alexander Petrosyan (http://paf.design.ru) - $Id: pa_globals.C,v 1.86 2001/10/27 13:00:10 paf Exp $ + $Id: pa_globals.C,v 1.89 2001/11/05 11:46:28 paf Exp $ */ #include "pa_globals.h" @@ -15,6 +15,7 @@ #include "pa_stylesheet_manager.h" #include "pa_charset_manager.h" #include "pa_sapi.h" +#include "pa_status_provider.h" #ifdef DB2 #include "pa_db_manager.h" @@ -191,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); @@ -222,6 +222,10 @@ 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);