--- parser3/src/main/pa_globals.C	2002/02/18 14:35:37	1.115
+++ parser3/src/main/pa_globals.C	2002/04/18 10:51:01	1.122
@@ -4,18 +4,17 @@
 	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
-	$Id: pa_globals.C,v 1.115 2002/02/18 14:35:37 paf Exp $
+	$Id: pa_globals.C,v 1.122 2002/04/18 10:51:01 paf Exp $
 */
 
 #include "pa_config_includes.h"
 
 #ifdef XML
-//#include "libxml/parser.h"
-//#include "libxslt/xslt.h"
-//#include "libxslt/libxslt.h"
 #include "libxslt/extensions.h"
 #include "libxslt/xsltutils.h"
+extern "C" {
 #include "libexslt/exslt.h"
+};
 #endif
 
 #include "pa_globals.h"
@@ -30,10 +29,6 @@
 #include "pa_charset.h"
 #include "pa_threads.h"
 
-#ifdef DB2
-#include "pa_db_manager.h"
-#endif
-
 String *content_type_name;
 String *charset_name;
 String *body_name;
@@ -44,14 +39,12 @@ String *name_name;
 String *size_name;
 String *text_name;
 
-String *exception_method_name;
+String *unhandled_exception_method_name;
 String *post_process_method_name;
 
 String *content_disposition_name;
 String *content_disposition_filename_name;
 
-String *unnamed_name;
-
 String *auto_method_name;
 String *main_method_name;
 
@@ -63,6 +56,12 @@ String *string_pre_match_name;
 String *string_match_name;
 String *string_post_match_name;
 
+String *exception_var_name;
+String *exception_type_part_name;
+String *exception_source_part_name;
+String *exception_comment_part_name;
+String *exception_handled_part_name;
+
 String *charsets_name;
 String *mime_types_name;
 String *vfile_mime_type_name;
@@ -71,7 +70,8 @@ String *origins_mode_name;
 String *class_path_name;
 
 String *switch_data_name;
-String *case_default_value;
+
+String *cache_data_name;
 
 String *sql_limit_name;
 String *sql_offset_name;
@@ -319,14 +319,12 @@ void pa_globals_init(Pool& pool) {
 	size_name=NEW String(pool, SIZE_NAME);
 	text_name=NEW String(pool, TEXT_NAME);
 
-	exception_method_name=NEW String(pool, EXCEPTION_METHOD_NAME);
+	unhandled_exception_method_name=NEW String(pool, UNHANDLED_EXCEPTION_METHOD_NAME);
 	post_process_method_name=NEW String(pool, POST_PROCESS_METHOD_NAME);
 
 	content_disposition_name=NEW String(pool, CONTENT_DISPOSITION_NAME);
 	content_disposition_filename_name=NEW String(pool, CONTENT_DISPOSITION_FILENAME_NAME);
 
-	unnamed_name=NEW String(pool, UNNAMED_NAME);
-
 	auto_method_name=NEW String(pool, AUTO_METHOD_NAME);
 	main_method_name=NEW String(pool, MAIN_METHOD_NAME);
 
@@ -338,6 +336,11 @@ void pa_globals_init(Pool& pool) {
 	string_match_name=NEW String(pool, STRING_MATCH_NAME);
 	string_post_match_name=NEW String(pool, STRING_POST_MATCH_NAME);
 
+	exception_var_name=NEW String(pool, EXCEPTION_VAR_NAME);
+	exception_type_part_name=NEW String(pool, EXCEPTION_TYPE_PART_NAME);
+	exception_source_part_name=NEW String(pool, EXCEPTION_SOURCE_PART_NAME);
+	exception_comment_part_name=NEW String(pool, EXCEPTION_COMMENT_PART_NAME);
+	exception_handled_part_name=NEW String(pool, EXCEPTION_HANDLED_PART_NAME);
 
 	charsets_name=NEW String(pool, CHARSETS_NAME);
 	mime_types_name=NEW String(pool, MIME_TYPES_NAME);
@@ -348,7 +351,9 @@ void pa_globals_init(Pool& pool) {
 
 	//^switch ^case
 	switch_data_name=NEW String(pool, SWITCH_DATA_NAME);
-	case_default_value=NEW String(pool, CASE_DEFAULT_VALUE);
+
+	//^cache
+	cache_data_name=NEW String(pool, CACHE_DATA_NAME);
 
 	// sql
 	sql_limit_name=NEW String(pool, SQL_LIMIT_NAME);
@@ -391,12 +396,6 @@ void pa_globals_init(Pool& pool) {
 	cache_managers->put(*NEW String(pool, "sql"), 
 		SQL_driver_manager=NEW SQL_Driver_manager(pool));
 
-#ifdef DB2
-	// DB driver manager
-	cache_managers->put(*NEW String(pool, "db"), 
-		DB_manager=NEW DB_Manager(pool));
-#endif
-
 #ifdef XML
 	// initializing xml libs
 
@@ -470,13 +469,3 @@ void pa_globals_init(Pool& pool) {
 #		pragma comment(lib, XML_LIBS "/gdome2-x.x.x/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