--- parser3/src/include/pa_globals.h 2003/01/29 15:39:27 1.101.2.9 +++ parser3/src/include/pa_globals.h 2003/11/26 12:49:27 1.108 @@ -1,22 +1,28 @@ /** @file Parser: global decls. - Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ #ifndef PA_GLOBALS_H #define PA_GLOBALS_H -static const char* IDENT_GLOBALS_H="$Date: 2003/01/29 15:39:27 $"; +static const char * const IDENT_GLOBALS_H="$Date: 2003/11/26 12:49:27 $"; + -#include "pa_pool.h" #include "pa_hash.h" #include "pa_string.h" +#ifdef XML +# include "libxml/tree.h" +# include "gdome.h" +#endif + class Dictionary; class Charset; class Table; +class Request; /// core func void pa_globals_init(); @@ -24,61 +30,6 @@ void pa_globals_init(); /// hex_value[c] = hex value of c extern short hex_value[0x100]; -//@{ -/// global string -extern StringPtr optimized_html_name; -extern StringPtr body_name; -extern StringPtr download_name; -extern StringPtr size_name; -extern StringPtr text_name; - -extern StringPtr conf_method_name; -extern StringPtr auto_method_name; - -extern StringPtr main_class_name; - - -extern StringPtr charsets_name; - -extern StringPtr mime_types_name; -extern StringPtr origins_mode_name; - -extern StringPtr match_var_name; - -extern StringPtr exception_var_name; -extern StringPtr exception_type_part_name; -extern StringPtr exception_source_part_name; -extern StringPtr exception_comment_part_name; -extern StringPtr exception_handled_part_name; - -extern StringPtr content_disposition_name; -extern StringPtr content_disposition_value; -extern StringPtr content_disposition_filename_name; - -extern StringPtr limits_name; - -extern StringPtr class_path_name; - -extern StringPtr switch_data_name; - -extern StringPtr cache_data_name; - -extern StringPtr sql_limit_name; -extern StringPtr sql_offset_name; -extern StringPtr sql_default_name; -extern StringPtr sql_distinct_name; - -extern StringPtr hash_default_element_name; - -extern StringPtr http_method_name; -extern StringPtr http_timeout_name; -extern StringPtr http_headers_name; -extern StringPtr http_any_status_name; -extern StringPtr file_status_name; - -//@} - - #ifdef XML /// DOMImplementation extern GdomeDOMImplementation *domimpl; @@ -86,7 +37,12 @@ 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(); +const char* xmlGenericErrors(); #endif +/// register request for local thread to retrive later with pa_get_request() +void pa_register_thread_request(Request&); +/// retrives request set by pa_set_request function, useful in contextless places [slow] +Request& pa_thread_request(); + #endif