--- parser3/src/main/pa_globals.C	2002/01/25 11:22:51	1.110
+++ parser3/src/main/pa_globals.C	2002/05/06 10:50:23	1.124.2.1
@@ -1,18 +1,15 @@
 /** @file
 	Parser: globals.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
+	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.110 2002/01/25 11:22:51 paf Exp $
+	$Id: pa_globals.C,v 1.124.2.1 2002/05/06 10:50:23 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" {
@@ -32,10 +29,6 @@ extern "C" {
 #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;
@@ -46,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;
 
@@ -61,9 +52,12 @@ String *main_class_name;
 
 String *result_var_name;
 String *match_var_name;
-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;
@@ -73,7 +67,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;
@@ -83,14 +78,18 @@ String *charset_UTF8_name;
 
 String *hash_default_element_name;
 
-Hash *untaint_lang_name2enum;
+Table *string_match_table_template;
 
-GdomeDOMImplementation *domimpl;
+Hash *untaint_lang_name2enum;
 
 Charset *utf8_charset;
 
 short hex_value[0x100];
 
+#ifdef XML
+GdomeDOMImplementation *domimpl;
+#endif
+
 static void setup_hex_value() {
 	memset(hex_value, 0, sizeof(hex_value));
 	hex_value['0'] = 0;	
@@ -319,14 +318,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);
 
@@ -334,10 +331,12 @@ void pa_globals_init(Pool& pool) {
 
 	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_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 +347,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);
@@ -361,7 +362,6 @@ void pa_globals_init(Pool& pool) {
 	// hash
 	hash_default_element_name=NEW String(pool, HASH_DEFAULT_ELEMENT_NAME);
 
-
 	// hashes
 	untaint_lang_name2enum=NEW Hash(pool);
 	#define ULN(cstr, LANG) \
@@ -378,6 +378,20 @@ void pa_globals_init(Pool& pool) {
 	ULN("html", HTML);
 	ULN("optimized-html", HTML|String::UL_OPTIMIZE_BIT);
 
+	// table
+	{ // create table
+		Array *string_match_table_columns=NEW Array(pool);
+		*string_match_table_columns+=NEW String(pool, STRING_PRE_MATCH_NAME);
+		*string_match_table_columns+=NEW String(pool, STRING_MATCH_NAME);
+		*string_match_table_columns+=NEW String(pool, STRING_POST_MATCH_NAME);
+		for(int i=1; i<=MAX_STRING_MATCH_TABLE_COLUMNS; i++) {
+			char *column=(char *)pool.malloc(MAX_NUMBER);
+			snprintf(column, MAX_NUMBER, "%d", i);
+			*string_match_table_columns+=NEW String(pool, column); // .i column name
+		}
+		string_match_table_template=NEW Table(pool, 0, string_match_table_columns);
+	}
+
 	// charsets
 	charsets=NEW Charsets(pool);
 	charsets->put(*charset_UTF8_name, 
@@ -391,12 +405,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
 
@@ -458,22 +466,15 @@ void pa_globals_init(Pool& pool) {
 #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_so/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")
+#		pragma comment(lib, XML_LIBS "/libxml2-x.x.x/win32/dsp/libxml2_so_debug/libxml2.lib")
+#		pragma comment(lib, XML_LIBS "/libxslt-x.x.x/win32/dsp/libexslt_so_debug/libexslt.lib")
+#		pragma comment(lib, XML_LIBS "/libxslt-x.x.x/win32/dsp/libxslt_so_debug/libxslt.lib")
+#		pragma comment(lib, XML_LIBS "/gdome2-x.x.x/win32/dsp/Debug/libgdome.lib")
 #	else
-#		pragma comment(lib, LIBDB2_WIN32_BUILD "/release/libdb.lib")
+#		pragma comment(lib, XML_LIBS "/libxml2-x.x.x/win32/dsp/libxml2_so_release/libxml2.lib")
+#		pragma comment(lib, XML_LIBS "/libxslt-x.x.x/win32/dsp/libexslt_so_release/libexslt.lib")
+#		pragma comment(lib, XML_LIBS "/libxslt-x.x.x/win32/dsp/libxslt_so_release/libxslt.lib")
+#		pragma comment(lib, XML_LIBS "/gdome2-x.x.x/win32/dsp/Release/libgdome.lib")
 #	endif
 #endif