--- parser3/src/main/pa_globals.C	2003/01/29 13:31:30	1.152.2.8
+++ parser3/src/main/pa_globals.C	2003/02/04 15:15:03	1.152.2.14
@@ -1,11 +1,11 @@
 /** @file
 	Parser: globals.
 
-	Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_GLOBALS_C="$Date: 2003/01/29 13:31:30 $";
+static const char* IDENT_GLOBALS_C="$Date: 2003/02/04 15:15:03 $";
 
 #include "pa_config_includes.h"
 
@@ -26,22 +26,11 @@ extern "C" {
 #include "pa_stylesheet_manager.h"
 #endif
 
-#define AUTO_FILE_NAME "auto.p"
 
-#define BODY_NAME "body"
-#define DOWNLOAD_NAME "download"
 
-#define CONF_METHOD_NAME "conf"
-#define AUTO_METHOD_NAME "auto"
-
-#define MAIN_CLASS_NAME "MAIN"
 
 #define DEFAULTS_NAME "DEFAULTS"
-#define CHARSETS_NAME "CHARSETS"
-#define MIME_TYPES_NAME "MIME-TYPES"
-#define ORIGINS_MODE_NAME "ORIGINS"
 
-#define RESULT_VAR_NAME "result"
 #define MATCH_VAR_NAME "match"
 
 #define EXCEPTION_VAR_NAME "exception"
@@ -51,19 +40,12 @@ extern "C" {
 #define EXCEPTION_HANDLED_PART_NAME "handled"
 
 
-#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"
 
 #define CACHE_DATA_NAME "CACHE-DATA"
 
-#define CLASS_PATH_NAME "CLASS_PATH"
-
 #define SQL_LIMIT_NAME "limit"
 #define SQL_OFFSET_NAME "offset"
 #define SQL_DEFAULT_NAME "default"
@@ -71,25 +53,7 @@ extern "C" {
 
 #define HASH_DEFAULT_ELEMENT_NAME "_default"
 
-#define HTTP_METHOD_NAME  "method"
-#define HTTP_TIMEOUT_NAME    "timeout"
-#define HTTP_HEADERS_NAME "headers"
-#define HTTP_ANY_STATUS_NAME "any-status"
-#define FILE_STATUS_NAME  "status"
-
-StringPtr body_name(new String(BODY_NAME));
-StringPtr download_name(new String(DOWNLOAD_NAME));
-
-StringPtr content_disposition_name(new String(CONTENT_DISPOSITION_NAME));
-StringPtr content_disposition_value(new String(CONTENT_DISPOSITION_VALUE));
-StringPtr content_disposition_filename_name(new String(CONTENT_DISPOSITION_FILENAME_NAME));
 
-StringPtr conf_method_name(new String(CONF_METHOD_NAME));
-StringPtr auto_method_name(new String(AUTO_METHOD_NAME));
-
-StringPtr main_class_name(new String(MAIN_CLASS_NAME));
-
-StringPtr result_var_name(new String(RESULT_VAR_NAME));
 StringPtr match_var_name(new String(MATCH_VAR_NAME));
 
 StringPtr exception_var_name(new String(EXCEPTION_VAR_NAME));
@@ -98,11 +62,6 @@ StringPtr exception_source_part_name(new
 StringPtr exception_comment_part_name(new String(EXCEPTION_COMMENT_PART_NAME));
 StringPtr exception_handled_part_name(new String(EXCEPTION_HANDLED_PART_NAME));
 
-StringPtr charsets_name(new String(CHARSETS_NAME));
-StringPtr mime_types_name(new String(MIME_TYPES_NAME));
-StringPtr origins_mode_name(new String(ORIGINS_MODE_NAME));
-
-StringPtr class_path_name(new String(CLASS_PATH_NAME));
 
 //^switch ^case
 StringPtr switch_data_name(new String(SWITCH_DATA_NAME));
@@ -119,13 +78,6 @@ StringPtr sql_distinct_name(new String(S
 // hash
 StringPtr hash_default_element_name(new String(HASH_DEFAULT_ELEMENT_NAME));
 
-// http
-StringPtr http_method_name(new String(HTTP_METHOD_NAME));
-StringPtr http_timeout_name(new String(HTTP_TIMEOUT_NAME));
-StringPtr http_headers_name(new String(HTTP_HEADERS_NAME));
-StringPtr http_any_status_name(new String(HTTP_ANY_STATUS_NAME));
-StringPtr file_status_name(new String(FILE_STATUS_NAME));
-
 short hex_value[0x100];
 
 #ifdef XML
@@ -177,7 +129,7 @@ XML_Generic_error_info *xml_generic_erro
 }
 
 static void
-xmlParserGenericErrorFunc(void *ctx, const char *msg, ...) { 
+xmlParserGenericErrorFunc(void *ctx, const char* msg, ...) { 
     pa_thread_t thread_id=pa_get_thread_id();
 
 	// infinitely looking for free slot to fill it
@@ -217,7 +169,7 @@ bool xmlHaveGenericErrors() {
 	return xml_generic_error_info(thread_id)!=0;
 }
 
-const char *xmlGenericErrors() {
+const char* xmlGenericErrors() {
     pa_thread_t thread_id=pa_get_thread_id();
 
 	SYNCHRONIZED;  // find+free blocked
@@ -226,7 +178,7 @@ const char *xmlGenericErrors() {
 	if(!p) // no errors for our thread_id registered
 		return 0;
 
-	const char *result=p->message;
+	const char* result=p->message;
 
 	// free slot up 
 	memset(p, 0, sizeof(*p));
@@ -244,7 +196,7 @@ const char *xmlGenericErrors() {
  * Returns 1 if matches, 0 otherwise
  */
 static int
-xmlFileMatchLocalhost(const char *filename) {
+xmlFileMatchLocalhost(const char* filename) {
     if (!strncmp(filename, "http://localhost", 16))
 	return(1);
     return(0);
@@ -263,7 +215,7 @@ xmlFileMatchLocalhost(const char *filena
  * Returns an I/O context or NULL in case of error
  */
 static void *
-xmlFileOpenLocalhost (const char *filename) {
+xmlFileOpenLocalhost (const char* filename) {
     FILE *fd;
     const char* documentRoot;
     char path[1000];