--- parser3/src/include/pa_globals.h	2002/04/18 10:51:00	1.82
+++ parser3/src/include/pa_globals.h	2002/09/17 10:58:24	1.95
@@ -3,23 +3,23 @@
 
 	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
-
-	$Id: pa_globals.h,v 1.82 2002/04/18 10:51:00 paf Exp $
 */
 
 #ifndef PA_GLOBALS_H
 #define PA_GLOBALS_H
 
+static const char* IDENT_GLOBALS_H="$Date: 2002/09/17 10:58:24 $";
+
 #include "pa_pool.h"
 
 class String;
 class Hash;
 class Dictionary;
 class Charset;
+class Table;
 
 //@{
 /// constant string. class name, predefined method & co
-#define CONFIG_FILE_NAME "parser3.conf"
 #define AUTO_FILE_NAME "auto.p"
 
 #define CONTENT_TYPE_NAME "content-type"
@@ -33,10 +33,7 @@ class Charset;
 #define SIZE_NAME "size"
 #define TEXT_NAME "text"
 
-#define UNHANDLED_EXCEPTION_METHOD_NAME "unhandled_exception"
-#define POST_PROCESS_METHOD_NAME "postprocess"
-
-#define MAIN_METHOD_NAME "main"
+#define CONF_METHOD_NAME "conf"
 #define AUTO_METHOD_NAME "auto"
 
 #define MAIN_CLASS_NAME "MAIN"
@@ -44,7 +41,6 @@ class Charset;
 #define DEFAULTS_NAME "DEFAULTS"
 #define CHARSETS_NAME "CHARSETS"
 #define MIME_TYPES_NAME "MIME-TYPES"
-#define VFILE_MIME_TYPE_NAME "mime-type"
 #define ORIGINS_MODE_NAME "ORIGINS"
 
 #define RESULT_VAR_NAME "result"
@@ -61,6 +57,9 @@ class Charset;
 #define STRING_MATCH_NAME "match"
 #define STRING_POST_MATCH_NAME "postmatch"
 
+#define DATE_CALENDAR_WEEKNO_NAME "week"
+#define DATE_CALENDAR_WEEKYEAR_NAME "year"
+
 #define CONTENT_DISPOSITION_NAME "content-disposition"
 #define CONTENT_DISPOSITION_FILENAME_NAME "filename"
 
@@ -73,6 +72,7 @@ class Charset;
 #define SQL_LIMIT_NAME "limit"
 #define SQL_OFFSET_NAME "offset"
 #define SQL_DEFAULT_NAME "default"
+#define SQL_DISTINCT_NAME "distinct"
 
 #define CHARSET_UTF8_NAME "UTF-8"
 
@@ -99,11 +99,8 @@ extern String *name_name;
 extern String *size_name;
 extern String *text_name;
 
-extern String *unhandled_exception_method_name;
-extern String *post_process_method_name;
-
+extern String *conf_method_name;
 extern String *auto_method_name;
-extern String *main_method_name;
 
 extern String *main_class_name;
 
@@ -111,14 +108,10 @@ extern String *main_class_name;
 extern String *charsets_name;
 
 extern String *mime_types_name;
-extern String *vfile_mime_type_name;
 extern String *origins_mode_name;
 
 extern String *result_var_name;
 extern String *match_var_name;
-extern String *string_pre_match_name;
-extern String *string_match_name;
-extern String *string_post_match_name;
 
 extern String *exception_var_name;
 extern String *exception_type_part_name;
@@ -140,6 +133,7 @@ extern String *cache_data_name;
 extern String *sql_limit_name;
 extern String *sql_offset_name;
 extern String *sql_default_name;
+extern String *sql_distinct_name;
 
 extern String *charset_UTF8_name;
 
@@ -147,6 +141,12 @@ extern String *hash_default_element_name
 
 //@}
 
+/// String::match uses this as replace & global search table columns
+const int MAX_STRING_MATCH_TABLE_COLUMNS=100;
+extern Table *string_match_table_template;
+
+extern Table *date_calendar_table_template;
+
 /// name to enum language table
 extern Hash *untaint_lang_name2enum;