--- parser3/src/main/pa_globals.C	2002/04/22 14:11:28	1.124
+++ parser3/src/main/pa_globals.C	2002/09/17 10:58:24	1.139
@@ -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 2002/04/22 14:11:28 paf Exp $
 */
 
+static const char* IDENT_GLOBALS_C="$Date: 2002/09/17 10:58:24 $";
+
 #include "pa_config_includes.h"
 
 #ifdef XML
@@ -39,14 +39,11 @@ String *name_name;
 String *size_name;
 String *text_name;
 
-String *unhandled_exception_method_name;
-String *post_process_method_name;
-
 String *content_disposition_name;
 String *content_disposition_filename_name;
 
+String *conf_method_name;
 String *auto_method_name;
-String *main_method_name;
 
 String *main_class_name;
 
@@ -73,6 +70,7 @@ String *cache_data_name;
 String *sql_limit_name;
 String *sql_offset_name;
 String *sql_default_name;
+String *sql_distinct_name;
 
 String *charset_UTF8_name;
 
@@ -80,6 +78,8 @@ String *hash_default_element_name;
 
 Table *string_match_table_template;
 
+Table *date_calendar_table_template;
+
 Hash *untaint_lang_name2enum;
 
 Charset *utf8_charset;
@@ -318,14 +318,11 @@ void pa_globals_init(Pool& pool) {
 	size_name=NEW String(pool, SIZE_NAME);
 	text_name=NEW String(pool, TEXT_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);
 
+	conf_method_name=NEW String(pool, CONF_METHOD_NAME);
 	auto_method_name=NEW String(pool, AUTO_METHOD_NAME);
-	main_method_name=NEW String(pool, MAIN_METHOD_NAME);
 
 	main_class_name=NEW String(pool, MAIN_CLASS_NAME);
 
@@ -340,7 +337,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);
@@ -355,6 +351,7 @@ void pa_globals_init(Pool& pool) {
 	sql_limit_name=NEW String(pool, SQL_LIMIT_NAME);
 	sql_offset_name=NEW String(pool, SQL_OFFSET_NAME);
 	sql_default_name=NEW String(pool, SQL_DEFAULT_NAME);
+	sql_distinct_name=NEW String(pool, SQL_DISTINCT_NAME);
 
 	// charsets
 	charset_UTF8_name=NEW String(pool, CHARSET_UTF8_NAME);
@@ -378,18 +375,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 *)malloc(MAX_NUMBER);
+			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, string_match_table_columns);
+		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
+		}
+		*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
@@ -441,7 +451,10 @@ void pa_globals_init(Pool& pool) {
 	xmlLoadExtDtdDefaultValue |= XML_DETECT_IDS;
 	// Bit in the loadsubset context field to tell to do complete the elements attributes lists 
 	// with the ones defaulted from the DTDs 
-    //never added yet xmlLoadExtDtdDefaultValue |= XML_COMPLETE_ATTRS;
+    xmlLoadExtDtdDefaultValue |= XML_COMPLETE_ATTRS;
+
+	// validate each document after load/create (?)
+	//xmlDoValidityCheckingDefaultValue = 1;
 
 //regretfully this not only replaces entities on parse, but also on generate	xmlSubstituteEntitiesDefault(1);
 	// never switched this on xmlIndentTreeOutput=1;
@@ -464,17 +477,17 @@ 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")
+#	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