--- parser3/src/include/pa_globals.h	2002/05/07 07:39:18	1.85
+++ parser3/src/include/pa_globals.h	2002/11/27 12:44:35	1.98
@@ -3,13 +3,13 @@
 
 	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.85 2002/05/07 07:39:18 paf Exp $
 */
 
 #ifndef PA_GLOBALS_H
 #define PA_GLOBALS_H
 
+static const char* IDENT_GLOBALS_H="$Date: 2002/11/27 12:44:35 $";
+
 #include "pa_pool.h"
 
 class String;
@@ -20,7 +20,6 @@ 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"
@@ -34,6 +33,7 @@ class Table;
 #define SIZE_NAME "size"
 #define TEXT_NAME "text"
 
+#define CONF_METHOD_NAME "conf"
 #define AUTO_METHOD_NAME "auto"
 
 #define MAIN_CLASS_NAME "MAIN"
@@ -41,7 +41,6 @@ class Table;
 #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"
@@ -58,7 +57,11 @@ class Table;
 #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_VALUE "attachment"
 #define CONTENT_DISPOSITION_FILENAME_NAME "filename"
 
 #define SWITCH_DATA_NAME "SWITCH-DATA"
@@ -70,11 +73,17 @@ class Table;
 #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"
 
 #define HASH_DEFAULT_ELEMENT_NAME "_default"
 
+#define HTTP_METHOD_NAME  "method"
+#define HTTP_TIMEOUT_NAME    "timeout"
+#define HTTP_HEADERS_NAME "headers"
+#define FILE_STATUS_NAME  "status"
+
 //@}
 
 /// core func
@@ -96,6 +105,7 @@ extern String *name_name;
 extern String *size_name;
 extern String *text_name;
 
+extern String *conf_method_name;
 extern String *auto_method_name;
 
 extern String *main_class_name;
@@ -104,7 +114,6 @@ 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;
@@ -117,6 +126,7 @@ extern String *exception_comment_part_na
 extern String *exception_handled_part_name;
 
 extern String *content_disposition_name;
+extern String *content_disposition_value;
 extern String *content_disposition_filename_name;
 
 extern String *limits_name;
@@ -130,20 +140,31 @@ 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;
 
 extern String *hash_default_element_name;
 
+extern String *http_method_name;
+extern String *http_timeout_name;
+extern String *http_headers_name;
+extern String *file_status_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;
 
+/// value of exif tag -> it's value
+extern Hash *exif_tag_value2name;
+
 
 /// UTF8 charset
 extern Charset *utf8_charset;