--- parser3/src/include/pa_globals.h	2001/04/04 10:50:34	1.37
+++ parser3/src/include/pa_globals.h	2003/01/23 17:05:33	1.101.2.2
@@ -1,136 +1,108 @@
 /** @file
 	Parser: global decls.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
-
-	$Id: pa_globals.h,v 1.37 2001/04/04 10:50:34 paf Exp $
+	Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
 #ifndef PA_GLOBALS_H
 #define PA_GLOBALS_H
 
+static const char* IDENT_GLOBALS_H="$Date: 2003/01/23 17:05:33 $";
+
 #include "pa_pool.h"
+#include "pa_hash.h"
+#include "pa_string.h"
 
-class String;
-class Hash;
+class Dictionary;
+class Charset;
 class Table;
 
-//@{
-/// constant string. class name, predefined method & co
-#define AUTO_FILE_NAME "auto.p"
-
-#define HTML_TYPO_NAME "html-typo"
-
-#define CONTENT_TYPE_NAME "content-type"
-#define BODY_NAME "body"
-#define VALUE_NAME "value"
-#define EXPIRES_NAME "expires"
-#define PATH_NAME "path"
-#define NAME_NAME "name"
-#define SIZE_NAME "size"
-#define TEXT_NAME "text"
-
-#define EXCEPTION_METHOD_NAME "exception"
-#define POST_PROCESS_METHOD_NAME "post-process"
-
-#define CONTENT_DISPOSITION_NAME "content-disposition"
-#define CONTENT_DISPOSITION_FILENAME_NAME "filename"
-
-#define UNNAMED_NAME "unnamed"
-
-#define MAIN_METHOD_NAME "main"
-#define AUTO_METHOD_NAME "auto"
-
-#define ROOT_CLASS_NAME "ROOT"
-#define MAIN_CLASS_NAME "MAIN"
-#define TABLE_CLASS_NAME "table"
-#define FILE_CLASS_NAME "file"
-#define ENV_CLASS_NAME "env"
-#define FORM_CLASS_NAME "form"
-#define REQUEST_CLASS_NAME "request"
-#define RESPONSE_CLASS_NAME "response"
-#define COOKIE_CLASS_NAME "cookie"
-#define RANDOM_CLASS_NAME "random"
-
-#define LIMITS_NAME "LIMITS"
-#define POST_MAX_SIZE_NAME "post_max_size"
-#define DEFAULTS_NAME "DEFAULTS"
-#define MIME_TYPES_NAME "MIME-TYPES"
-#define VFILE_MIME_TYPE_NAME "mime-type"
-
-#define MAIN_SQL_NAME "SQL"
-#define MAIN_SQL_DRIVERS_NAME "drivers"
-
-#define RESULT_VAR_NAME "result"
-
-#define STRING_PRE_MATCH_NAME "pre-match"
-#define STRING_MATCH_NAME "match"
-#define STRING_POST_MATCH_NAME "post-match"
-//@}
-
 /// core func
-void pa_globals_init(Pool& pool);
+void pa_globals_init();
 
 /// hex_value[c] = hex value of c
 extern short hex_value[0x100];
 
 //@{
 /// global string
-extern String *html_typo_name;
-extern String *content_type_name;
-extern String *body_name;
-extern String *value_name;
-extern String *expires_name;
-extern String *path_name;
-extern String *name_name;
-extern String *size_name;
-extern String *text_name;
-
-extern String *exception_method_name;
-extern String *post_process_method_name;
-
-extern String *content_disposition_name;
-extern String *content_disposition_filename_name;
-
-extern String *unnamed_name;
-extern String *empty_string;
-
-extern String *auto_method_name;
-extern String *main_method_name;
-
-extern String *root_class_name;
-extern String *main_class_name;
-extern String *env_class_name;
-extern String *table_class_name;
-extern String *file_class_name;
-extern String *form_class_name;
-extern String *request_class_name;
-extern String *response_class_name;
-extern String *cookie_class_name;
-extern String *random_class_name;
-
-extern String *limits_name;
-extern String *post_max_size_name;
-
-extern String *defaults_name;
-extern String *mime_types_name;
-extern String *vfile_mime_type_name;
-
-extern String *main_sql_name;
-extern String *main_sql_drivers_name;
-
-extern String *result_var_name;
-extern String *string_pre_match_name;
-extern String *string_match_name;
-extern String *string_post_match_name;
+extern String optimized_html_name;
+extern String content_type_name;
+extern String charset_name;
+extern String body_name;
+extern String download_name;
+extern String value_name;
+extern String expires_name;
+extern String path_name;
+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;
+
+
+extern String charsets_name;
+
+extern String mime_types_name;
+extern String origins_mode_name;
+
+extern String result_var_name;
+extern String match_var_name;
+
+extern String exception_var_name;
+extern String exception_type_part_name;
+extern String exception_source_part_name;
+extern String exception_comment_part_name;
+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;
+
+extern String class_path_name;
+
+extern String switch_data_name;
+
+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 http_any_status_name;
+extern String file_status_name;
+
 //@}
 
-/// global hash
-extern Hash *untaint_lang_name2enum;
+extern Table date_calendar_table_template;
 
-/// global table
-extern Table *default_typo_table;
+/// name to enum language table
+extern Hash<String, int> untaint_lang_name2enum;
+
+/// UTF8 charset
+extern Charset utf8_charset;
+
+#ifdef XML
+/// DOMImplementation
+extern GdomeDOMImplementation *domimpl;
+
+/// flag whether there were some xml generic errors on current thread
+bool xmlHaveGenericErrors();
+/// get xml generic error accumulated for current thread. WARNING: it is up to caller to free up
+const char *xmlGenericErrors();
+#endif
 
 #endif