--- parser3/src/main/pa_globals.C	2002/06/03 14:42:03	1.124.2.3
+++ parser3/src/main/pa_globals.C	2002/08/08 14:35:31	1.137
@@ -3,10 +3,10 @@
 
 	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.124.2.3 2002/06/03 14:42:03 paf Exp $
 */
 
+static const char* IDENT_GLOBALS_C="$Date: 2002/08/08 14:35:31 $";
+
 #include "pa_config_includes.h"
 
 #ifdef XML
@@ -42,6 +42,7 @@ String *text_name;
 String *content_disposition_name;
 String *content_disposition_filename_name;
 
+String *conf_method_name;
 String *auto_method_name;
 
 String *main_class_name;
@@ -76,6 +77,8 @@ String *hash_default_element_name;
 
 Table *string_match_table_template;
 
+Table *date_calendar_table_template;
+
 Hash *untaint_lang_name2enum;
 
 Charset *utf8_charset;
@@ -317,6 +320,7 @@ void pa_globals_init(Pool& pool) {
 	content_disposition_name=NEW String(pool, CONTENT_DISPOSITION_NAME);
 	content_disposition_filename_name=NEW String(pool, CONTENT_DISPOSITION_FILENAME_NAME);
 
+	conf_method_name=NEW String(pool, CONF_METHOD_NAME);
 	auto_method_name=NEW String(pool, AUTO_METHOD_NAME);
 
 	main_class_name=NEW String(pool, MAIN_CLASS_NAME);
@@ -332,7 +336,6 @@ void pa_globals_init(Pool& pool) {
 
 	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);
 
 	class_path_name=NEW String(pool, CLASS_PATH_NAME);
@@ -370,18 +373,31 @@ 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);
+	// string_match_table_template
+	{
+		Array *columns=NEW Array(pool);
+		*columns+=NEW String(pool, STRING_PRE_MATCH_NAME);
+		*columns+=NEW String(pool, STRING_MATCH_NAME);
+		*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
+			*columns+=NEW String(pool, column); // .i column name
+		}
+		string_match_table_template=NEW Table(pool, 0, columns);
+	}
+
+	// date_calendar_table_template
+	{
+		Array *columns=NEW Array(pool);
+		for(int i=0; i<=6; i++) {
+			char *column=(char *)pool.malloc(MAX_NUMBER);
+			snprintf(column, MAX_NUMBER, "%d", i);
+			*columns+=NEW String(pool, column); // .i column name
 		}
-		string_match_table_template=NEW Table(pool, 0, string_match_table_columns);
+		*columns+=NEW String(pool, DATE_CALENDAR_WEEKNO_NAME);
+		*columns+=NEW String(pool, DATE_CALENDAR_WEEKYEAR_NAME);
+		date_calendar_table_template=NEW Table(pool, 0, columns);
 	}
 
 	// charsets
@@ -456,17 +472,17 @@ void pa_globals_init(Pool& pool) {
 }
 
 #if defined(XML) && defined(_MSC_VER)
-#	define XML_LIBS "/parser3project/win32/xml"
-#	pragma comment(lib, XML_LIBS "/glib/lib/libglib-1.3-11.lib")
+#	define GNOME_LIBS "/parser3project/win32xml/win32/gnome"
+#	pragma comment(lib, GNOME_LIBS "/glib/lib/libglib-1.3-11.lib")
 #	ifdef _DEBUG
-#		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")
+#		pragma comment(lib, GNOME_LIBS "/libxml2-x.x.x/win32/dsp/libxml2_so_debug/libxml2.lib")
+#		pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libexslt_so_debug/libexslt.lib")
+#		pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libxslt_so_debug/libxslt.lib")
+#		pragma comment(lib, GNOME_LIBS "/gdome2-x.x.x/win32/dsp/Debug/libgdome.lib")
 #	else
-#		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")
+#		pragma comment(lib, GNOME_LIBS "/libxml2-x.x.x/win32/dsp/libxml2_so_release/libxml2.lib")
+#		pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libexslt_so_release/libexslt.lib")
+#		pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libxslt_so_release/libxslt.lib")
+#		pragma comment(lib, GNOME_LIBS "/gdome2-x.x.x/win32/dsp/Release/libgdome.lib")
 #	endif
 #endif