--- parser3/src/main/pa_globals.C 2001/09/06 08:25:08 1.71 +++ parser3/src/main/pa_globals.C 2001/10/12 12:15:32 1.82 @@ -2,19 +2,22 @@ Parser: globals. Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://design.ru/paf) + + $Id: pa_globals.C,v 1.82 2001/10/12 12:15:32 parser Exp $ */ -static const char *RCSId="$Id: pa_globals.C,v 1.71 2001/09/06 08:25:08 parser Exp $"; #include "pa_globals.h" #include "pa_string.h" #include "pa_hash.h" #include "pa_sql_driver_manager.h" #include "pa_dictionary.h" +#include "pa_xslt_stylesheet_manager.h" +#include "pa_charset_manager.h" String *user_html_name; String *content_type_name; +String *charset_name; String *body_name; String *value_name; String *expires_name; @@ -30,7 +33,6 @@ String *content_disposition_name; String *content_disposition_filename_name; String *unnamed_name; -String *empty_string; String *auto_method_name; String *main_method_name; @@ -44,13 +46,7 @@ String *string_match_name; String *string_post_match_name; String *defaults_name; -String *ctype_name; -String *ctype_white_space_name; -String *ctype_digit_name; -String *ctype_hex_digit_name; -String *ctype_letter_name; -String *ctype_word_name; -String *ctype_lowercase_name; +String *charsets_name; String *mime_types_name; String *vfile_mime_type_name; String *origins_mode_name; @@ -108,6 +104,7 @@ void pa_globals_init(Pool& pool) { // names user_html_name=NEW String(pool, USER_HTML_NAME); 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); @@ -123,7 +120,6 @@ void pa_globals_init(Pool& pool) { content_disposition_filename_name=NEW String(pool, CONTENT_DISPOSITION_FILENAME_NAME); unnamed_name=NEW String(pool, UNNAMED_NAME); - empty_string=NEW String(pool); auto_method_name=NEW String(pool, AUTO_METHOD_NAME); main_method_name=NEW String(pool, MAIN_METHOD_NAME); @@ -138,13 +134,7 @@ void pa_globals_init(Pool& pool) { defaults_name=NEW String(pool, DEFAULTS_NAME); - ctype_name=NEW String(pool, CTYPE_NAME); - ctype_white_space_name=NEW String(pool, CTYPE_WHITE_SPACE_NAME); - ctype_digit_name=NEW String(pool, CTYPE_DIGIT_NAME); - ctype_hex_digit_name=NEW String(pool, CTYPE_HEX_DIGIT_NAME); - ctype_letter_name=NEW String(pool, CTYPE_LETTER_NAME); - ctype_word_name=NEW String(pool, CTYPE_WORD_NAME); - ctype_lowercase_name=NEW String(pool, CTYPE_LOWERCASE_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); @@ -170,13 +160,14 @@ void pa_globals_init(Pool& pool) { String var(pool, cstr); \ untaint_lang_name2enum->put(var, (int)String::UL_##LANG); ULN(as_is, "as-is", AS_IS); - ULN(file_name, "file-name", FILE_NAME); + ULN(file_name, "file-spec", FILE_SPEC); ULN(http_header, "http-header", HTTP_HEADER); ULN(mail_header, "mail-header", MAIL_HEADER); ULN(uri, "uri", URI); ULN(table, "table", TABLE); ULN(sql, "sql", SQL); ULN(js, "js", JS); + ULN(xml, "xml", XML); ULN(html, "html", HTML); ULN(user_html, "user-html", USER_HTML); @@ -196,6 +187,42 @@ void pa_globals_init(Pool& pool) { DT_ROW("\\n", "
"); default_typo_dict=NEW Dictionary(*default_typo_table); - // SQL_Driver_manager + // SQL driver manager SQL_driver_manager=NEW SQL_Driver_manager(pool); + +#ifdef XML + // XSLT stylesheet driver manager + XSLT_stylesheet_manager=NEW XSLT_Stylesheet_manager(pool); +#endif + + // Charset manager + charset_manager=NEW Charset_manager(pool); } + +#if defined(XML) && defined(_MSC_VER) +# define XERCES_BUILD_WIN32_BUILD "/parser3project/win32xml/xml-xerces/c/Build/Win32/VC6" +# define XALAN_BUILD_WIN32_BUILD "/parser3project/win32xml/xml-xalan/c/Build/Win32/VC6" +# ifdef _DEBUG +# pragma comment(lib, XERCES_BUILD_WIN32_BUILD "/Debug/xerces-c_1D.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Debug/XSLTD.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Debug/XPathD.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Debug/XalanTransformerD.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Debug/XalanDOMD.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Debug/DOMSupportD.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Debug/PlatformSupportD.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Debug/XMLSupportD.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Debug/XercesParserLiaisonD.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Debug/XalanSourceTreeD.lib") +# else +# pragma comment(lib, XERCES_BUILD_WIN32_BUILD "/Release/xerces-c_1.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Release/XalanSourceTree.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Release/PlatformSupport.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Release/XalanDOM.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Release/DOMSupport.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Release/XalanTransformer.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Release/XercesParserLiaison.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Release/XMLSupport.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Release/XPath.lib") +# pragma comment(lib, XALAN_BUILD_WIN32_BUILD "/Release/XSLT.lib") +# endif +#endif