--- parser3/src/main/pa_globals.C	2001/10/29 14:13:15	1.87
+++ parser3/src/main/pa_globals.C	2001/11/19 12:17:06	1.92
@@ -2,9 +2,9 @@
 	Parser: globals.
 
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
 
-	$Id: pa_globals.C,v 1.87 2001/10/29 14:13:15 paf Exp $
+	$Id: pa_globals.C,v 1.92 2001/11/19 12:17:06 paf Exp $
 */
 
 #include "pa_globals.h"
@@ -15,12 +15,12 @@
 #include "pa_stylesheet_manager.h"
 #include "pa_charset_manager.h"
 #include "pa_sapi.h"
+#include "pa_cache_managers.h"
 
 #ifdef DB2
 #include "pa_db_manager.h"
 #endif
 
-String *user_html_name;
 String *content_type_name;
 String *charset_name;
 String *body_name;
@@ -137,7 +137,6 @@ void pa_globals_init(Pool& pool) {
 	setup_hex_value();
 
 	// names
-	user_html_name=NEW String(pool, USER_HTML_NAME);
 	content_type_name=NEW String(pool, CONTENT_TYPE_NAME);
 	charset_name=NEW String(pool, CHARSET_NAME);
 	body_name=NEW String(pool, BODY_NAME);
@@ -203,7 +202,7 @@ void pa_globals_init(Pool& pool) {
 	ULN("js", JS);
 	ULN("xml", XML);
 	ULN("html", HTML);
-	ULN("user-html", USER_HTML);
+	ULN("optimized-html", HTML|String::UL_OPTIMIZE_BIT);
 
 	// tables
 	Table *default_typo_table=NEW Table(pool, 0, 0);
@@ -221,21 +220,28 @@ void pa_globals_init(Pool& pool) {
 	DT_ROW("\\n", "<br>");
 	default_typo_dict=NEW Dictionary(*default_typo_table);
 
+	// Status registration, must be initialized before all registrants
+	cache_managers=NEW Cache_managers(pool);
+
 	// SQL driver manager
- 	SQL_driver_manager=NEW SQL_Driver_manager(pool);
+	cache_managers->put(*NEW String(pool, "sql"), 
+		SQL_driver_manager=NEW SQL_Driver_manager(pool));
 
 #ifdef DB2
 	// DB driver manager
-	DB_manager=NEW DB_Manager(pool);
+	cache_managers->put(*NEW String(pool, "db"), 
+		DB_manager=NEW DB_Manager(pool));
 #endif
 
 #ifdef XML
 	// XSLT stylesheet driver manager
- 	stylesheet_manager=NEW Stylesheet_manager(pool);
+	cache_managers->put(*NEW String(pool, "stylesheet"), 
+		stylesheet_manager=NEW Stylesheet_manager(pool));
 #endif
 
 	// Charset manager 
-	charset_manager=NEW Charset_manager(pool);
+	cache_managers->put(*NEW String(pool, "charset"), 
+		charset_manager=NEW Charset_manager(pool));
 }
 
 #if defined(XML) && defined(_MSC_VER)