--- parser3/src/main/pa_globals.C 2002/06/12 11:40:32 1.129 +++ parser3/src/main/pa_globals.C 2003/01/29 15:39:28 1.152.2.9 @@ -1,12 +1,12 @@ /** @file Parser: globals. - Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) - - $Id: pa_globals.C,v 1.129 2002/06/12 11:40:32 paf Exp $ */ +static const char* IDENT_GLOBALS_C="$Date: 2003/01/29 15:39:28 $"; + #include "pa_config_includes.h" #ifdef XML @@ -19,67 +19,110 @@ extern "C" { #include "pa_globals.h" #include "pa_string.h" -#include "pa_hash.h" -#include "pa_sql_driver_manager.h" -#include "pa_dictionary.h" -#include "pa_stylesheet_manager.h" #include "pa_sapi.h" -#include "pa_cache_managers.h" -#include "pa_charsets.h" -#include "pa_charset.h" #include "pa_threads.h" -String *content_type_name; -String *charset_name; -String *body_name; -String *value_name; -String *expires_name; -String *path_name; -String *name_name; -String *size_name; -String *text_name; +#ifdef XML +#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" -String *content_disposition_name; -String *content_disposition_filename_name; +#define MATCH_VAR_NAME "match" -String *rootconf_method_name; -String *auto_method_name; +#define EXCEPTION_VAR_NAME "exception" +#define EXCEPTION_TYPE_PART_NAME "type" +#define EXCEPTION_SOURCE_PART_NAME "source" +#define EXCEPTION_COMMENT_PART_NAME "comment" +#define EXCEPTION_HANDLED_PART_NAME "handled" -String *main_class_name; -String *result_var_name; -String *match_var_name; +#define DATE_CALENDAR_WEEKNO_NAME "week" +#define DATE_CALENDAR_WEEKYEAR_NAME "year" -String *exception_var_name; -String *exception_type_part_name; -String *exception_source_part_name; -String *exception_comment_part_name; -String *exception_handled_part_name; +#define CONTENT_DISPOSITION_NAME "content-disposition" +#define CONTENT_DISPOSITION_VALUE "attachment" +#define CONTENT_DISPOSITION_FILENAME_NAME "filename" -String *charsets_name; -String *mime_types_name; -String *vfile_mime_type_name; -String *origins_mode_name; +#define SWITCH_DATA_NAME "SWITCH-DATA" -String *class_path_name; +#define CACHE_DATA_NAME "CACHE-DATA" -String *switch_data_name; +#define CLASS_PATH_NAME "CLASS_PATH" -String *cache_data_name; +#define SQL_LIMIT_NAME "limit" +#define SQL_OFFSET_NAME "offset" +#define SQL_DEFAULT_NAME "default" +#define SQL_DISTINCT_NAME "distinct" -String *sql_limit_name; -String *sql_offset_name; -String *sql_default_name; +#define HASH_DEFAULT_ELEMENT_NAME "_default" -String *charset_UTF8_name; +#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" -String *hash_default_element_name; +StringPtr body_name(new String(BODY_NAME)); +StringPtr download_name(new String(DOWNLOAD_NAME)); -Table *string_match_table_template; +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)); -Hash *untaint_lang_name2enum; +StringPtr conf_method_name(new String(CONF_METHOD_NAME)); +StringPtr auto_method_name(new String(AUTO_METHOD_NAME)); -Charset *utf8_charset; +StringPtr main_class_name(new String(MAIN_CLASS_NAME)); + +StringPtr match_var_name(new String(MATCH_VAR_NAME)); + +StringPtr exception_var_name(new String(EXCEPTION_VAR_NAME)); +StringPtr exception_type_part_name(new String(EXCEPTION_TYPE_PART_NAME)); +StringPtr exception_source_part_name(new String(EXCEPTION_SOURCE_PART_NAME)); +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)); + +//^cache +StringPtr cache_data_name(new String(CACHE_DATA_NAME)); + +// sql +StringPtr sql_limit_name(new String(SQL_LIMIT_NAME)); +StringPtr sql_offset_name(new String(SQL_OFFSET_NAME)); +StringPtr sql_default_name(new String(SQL_DEFAULT_NAME)); +StringPtr sql_distinct_name(new String(SQL_DISTINCT_NAME)); + +// 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]; @@ -246,33 +289,18 @@ xmlFileOpenLocalhost (const char *filena * Returns the number of bytes written */ static int -xmlFileRead (void * context, char * buffer, int len) { +pa_xmlFileRead (void * context, char * buffer, int len) { return(fread(&buffer[0], 1, len, (FILE *) context)); } /** - * xmlFileWrite: - * @context: the I/O context - * @buffer: where to drop data - * @len: number of bytes to write - * - * Write @len bytes from @buffer to the I/O channel. - * - * Returns the number of bytes written - */ -static int -xmlFileWrite (void * context, const char * buffer, int len) { - return(fwrite(&buffer[0], 1, len, (FILE *) context)); -} - -/** * xmlFileClose: * @context: the I/O context * * Close an I/O channel */ static int -xmlFileClose (void * context) { +pa_xmlFileClose (void * context) { return ( ( fclose((FILE *) context) == EOF ) ? -1 : 0 ); } @@ -284,121 +312,18 @@ void pa_globals_destroy(void *) { GdomeException exc; gdome_di_unref (domimpl, &exc); #endif - if(cache_managers) - cache_managers->~Cache_managers(); - - charsets->~Charsets(); - } catch(const Exception& e) { SAPI::die("pa_globals_destroy failed: %s", e.comment()); } } -/// @test hint on one should call this for each thread xmlSubstituteEntitiesDefault(1); -void pa_globals_init(Pool& pool) { - pool.register_cleanup(pa_globals_destroy, 0); - #undef NEW - #define NEW new(pool) +/// @test hint on one should call this for each thread xmlSubstituteEntitiesDefault(1); +void pa_globals_init() { // hex value setup_hex_value(); - // names - content_type_name=NEW String(pool, CONTENT_TYPE_NAME); - charset_name=NEW String(pool, CHARSET_NAME); - body_name=NEW String(pool, BODY_NAME); - value_name=NEW String(pool, VALUE_NAME); - expires_name=NEW String(pool, EXPIRES_NAME); - path_name=NEW String(pool, PATH_NAME); - name_name=NEW String(pool, NAME_NAME); - size_name=NEW String(pool, SIZE_NAME); - text_name=NEW String(pool, TEXT_NAME); - - content_disposition_name=NEW String(pool, CONTENT_DISPOSITION_NAME); - content_disposition_filename_name=NEW String(pool, CONTENT_DISPOSITION_FILENAME_NAME); - - rootconf_method_name=NEW String(pool, ROOTCONF_METHOD_NAME); - auto_method_name=NEW String(pool, AUTO_METHOD_NAME); - - main_class_name=NEW String(pool, MAIN_CLASS_NAME); - - result_var_name=NEW String(pool, RESULT_VAR_NAME); - match_var_name=NEW String(pool, MATCH_VAR_NAME); - - exception_var_name=NEW String(pool, EXCEPTION_VAR_NAME); - exception_type_part_name=NEW String(pool, EXCEPTION_TYPE_PART_NAME); - exception_source_part_name=NEW String(pool, EXCEPTION_SOURCE_PART_NAME); - exception_comment_part_name=NEW String(pool, EXCEPTION_COMMENT_PART_NAME); - exception_handled_part_name=NEW String(pool, EXCEPTION_HANDLED_PART_NAME); - - charsets_name=NEW String(pool, CHARSETS_NAME); - mime_types_name=NEW String(pool, MIME_TYPES_NAME); - vfile_mime_type_name=NEW String(pool, VFILE_MIME_TYPE_NAME); - origins_mode_name=NEW String(pool, ORIGINS_MODE_NAME); - - class_path_name=NEW String(pool, CLASS_PATH_NAME); - - //^switch ^case - switch_data_name=NEW String(pool, SWITCH_DATA_NAME); - - //^cache - cache_data_name=NEW String(pool, CACHE_DATA_NAME); - - // sql - sql_limit_name=NEW String(pool, SQL_LIMIT_NAME); - sql_offset_name=NEW String(pool, SQL_OFFSET_NAME); - sql_default_name=NEW String(pool, SQL_DEFAULT_NAME); - - // charsets - charset_UTF8_name=NEW String(pool, CHARSET_UTF8_NAME); - - // hash - hash_default_element_name=NEW String(pool, HASH_DEFAULT_ELEMENT_NAME); - - // hashes - untaint_lang_name2enum=NEW Hash(pool); - #define ULN(cstr, LANG) \ - untaint_lang_name2enum->put(*NEW String(pool, cstr), (int)String::UL_##LANG); - ULN("as-is", AS_IS); - ULN("file-spec", FILE_SPEC); - ULN("http-header", HTTP_HEADER); - ULN("mail-header", MAIL_HEADER); - ULN("uri", URI); - ULN("table", TABLE); - ULN("sql", SQL); - ULN("js", JS); - ULN("xml", XML); - ULN("html", HTML); - ULN("optimized-html", HTML|String::UL_OPTIMIZE_BIT); - - // table - { // create table - Array *string_match_table_columns=NEW Array(pool); - *string_match_table_columns+=NEW String(pool, STRING_PRE_MATCH_NAME); - *string_match_table_columns+=NEW String(pool, STRING_MATCH_NAME); - *string_match_table_columns+=NEW String(pool, STRING_POST_MATCH_NAME); - for(int i=1; i<=MAX_STRING_MATCH_TABLE_COLUMNS; i++) { - char *column=(char *)pool.malloc(MAX_NUMBER); - snprintf(column, MAX_NUMBER, "%d", i); - *string_match_table_columns+=NEW String(pool, column); // .i column name - } - string_match_table_template=NEW Table(pool, 0, string_match_table_columns); - } - - // charsets - charsets=NEW Charsets(pool); - charsets->put(*charset_UTF8_name, - utf8_charset=NEW Charset(pool, *charset_UTF8_name, 0/*no file=system*/)); - - - // Status registration, must be initialized before all registrants - cache_managers=NEW Cache_managers(pool); - - // SQL driver manager - cache_managers->put(*NEW String(pool, "sql"), - SQL_driver_manager=NEW SQL_Driver_manager(pool)); - #ifdef XML // initializing xml libs @@ -435,7 +360,10 @@ void pa_globals_init(Pool& pool) { xmlLoadExtDtdDefaultValue |= XML_DETECT_IDS; // Bit in the loadsubset context field to tell to do complete the elements attributes lists // with the ones defaulted from the DTDs - //never added yet xmlLoadExtDtdDefaultValue |= XML_COMPLETE_ATTRS; + xmlLoadExtDtdDefaultValue |= XML_COMPLETE_ATTRS; + + // validate each document after load/create (?) + //xmlDoValidityCheckingDefaultValue = 1; //regretfully this not only replaces entities on parse, but also on generate xmlSubstituteEntitiesDefault(1); // never switched this on xmlIndentTreeOutput=1; @@ -449,7 +377,7 @@ void pa_globals_init(Pool& pool) { // http://localhost/abc -> $ENV{DOCUMENT_ROOT}/abc | ./abc xmlRegisterInputCallbacks( xmlFileMatchLocalhost, xmlFileOpenLocalhost, - xmlFileRead, xmlFileClose); + pa_xmlFileRead, pa_xmlFileClose); // XSLT stylesheet manager cache_managers->put(*NEW String(pool, "stylesheet"), @@ -458,17 +386,17 @@ void pa_globals_init(Pool& pool) { } #if defined(XML) && defined(_MSC_VER) -# define XML_LIBS "/parser3project/win32/xml" -# pragma comment(lib, XML_LIBS "/glib/lib/libglib-1.3-11.lib") +# define GNOME_LIBS "/parser3project/win32xml/win32/gnome" +# pragma comment(lib, GNOME_LIBS "/glib/lib/libglib-1.3-11.lib") # ifdef _DEBUG -# pragma comment(lib, XML_LIBS "/libxml2-x.x.x/win32/dsp/libxml2_so_debug/libxml2.lib") -# pragma comment(lib, XML_LIBS "/libxslt-x.x.x/win32/dsp/libexslt_so_debug/libexslt.lib") -# pragma comment(lib, XML_LIBS "/libxslt-x.x.x/win32/dsp/libxslt_so_debug/libxslt.lib") -# pragma comment(lib, XML_LIBS "/gdome2-x.x.x/win32/dsp/Debug/libgdome.lib") +# pragma comment(lib, GNOME_LIBS "/libxml2-x.x.x/win32/dsp/libxml2_so_debug/libxml2.lib") +# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libexslt_so_debug/libexslt.lib") +# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libxslt_so_debug/libxslt.lib") +# pragma comment(lib, GNOME_LIBS "/gdome2-x.x.x/win32/dsp/Debug/libgdome.lib") # else -# pragma comment(lib, XML_LIBS "/libxml2-x.x.x/win32/dsp/libxml2_so_release/libxml2.lib") -# pragma comment(lib, XML_LIBS "/libxslt-x.x.x/win32/dsp/libexslt_so_release/libexslt.lib") -# pragma comment(lib, XML_LIBS "/libxslt-x.x.x/win32/dsp/libxslt_so_release/libxslt.lib") -# pragma comment(lib, XML_LIBS "/gdome2-x.x.x/win32/dsp/Release/libgdome.lib") +# pragma comment(lib, GNOME_LIBS "/libxml2-x.x.x/win32/dsp/libxml2_so_release/libxml2.lib") +# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libexslt_so_release/libexslt.lib") +# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libxslt_so_release/libxslt.lib") +# pragma comment(lib, GNOME_LIBS "/gdome2-x.x.x/win32/dsp/Release/libgdome.lib") # endif #endif