Diff for /parser3/src/main/pa_globals.C between versions 1.123 and 1.152.2.2

version 1.123, 2002/04/19 09:36:51 version 1.152.2.2, 2003/01/23 17:05:34
Line 1 Line 1
 /** @file  /** @file
         Parser: globals.          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 <paf@design.ru> (http://paf.design.ru)          Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
   
         $Id$  
 */  */
   
   static const char* IDENT_GLOBALS_C="$Date$";
   
 #include "pa_config_includes.h"  #include "pa_config_includes.h"
   
 #ifdef XML  #ifdef XML
Line 29  extern "C" { Line 29  extern "C" {
 #include "pa_charset.h"  #include "pa_charset.h"
 #include "pa_threads.h"  #include "pa_threads.h"
   
 String *content_type_name;  #define AUTO_FILE_NAME "auto.p"
 String *charset_name;  
 String *body_name;  #define CONTENT_TYPE_NAME "content-type"
 String *value_name;  #define CHARSET_NAME "charset"
 String *expires_name;  #define BODY_NAME "body"
 String *path_name;  #define DOWNLOAD_NAME "download"
 String *name_name;  #define VALUE_NAME "value"
 String *size_name;  #define EXPIRES_NAME "expires"
 String *text_name;  #define PATH_NAME "path"
   #define NAME_NAME "name"
   #define NONAME_DAT "noname.dat"
   #define SIZE_NAME "size"
   #define TEXT_NAME "text"
   
   #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"
   #define EXCEPTION_TYPE_PART_NAME "type"
   #define EXCEPTION_SOURCE_PART_NAME "source"
   #define EXCEPTION_COMMENT_PART_NAME "comment"
   #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"
   #define SQL_DISTINCT_NAME "distinct"
   
   #define CHARSET_UTF8_NAME "UTF-8"
   
   #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"
   
   String content_type_name(CONTENT_TYPE_NAME);
   String charset_name(CHARSET_NAME);
   String body_name(BODY_NAME);
   String download_name(DOWNLOAD_NAME);
   String value_name(VALUE_NAME);
   String expires_name(EXPIRES_NAME);
   String path_name(PATH_NAME);
   String name_name(NAME_NAME);
   String size_name(SIZE_NAME);
   String text_name(TEXT_NAME);
   
 String *unhandled_exception_method_name;  String content_disposition_name(CONTENT_DISPOSITION_NAME);
 String *post_process_method_name;  String content_disposition_value(CONTENT_DISPOSITION_VALUE);
   String content_disposition_filename_name(CONTENT_DISPOSITION_FILENAME_NAME);
   
 String *content_disposition_name;  String conf_method_name(CONF_METHOD_NAME);
 String *content_disposition_filename_name;  String auto_method_name(AUTO_METHOD_NAME);
   
 String *auto_method_name;  String main_class_name(MAIN_CLASS_NAME);
 String *main_method_name;  
   
 String *main_class_name;  String result_var_name(RESULT_VAR_NAME);
   String match_var_name(MATCH_VAR_NAME);
   
 String *result_var_name;  String exception_var_name(EXCEPTION_VAR_NAME);
 String *match_var_name;  String exception_type_part_name(EXCEPTION_TYPE_PART_NAME);
   String exception_source_part_name(EXCEPTION_SOURCE_PART_NAME);
   String exception_comment_part_name(EXCEPTION_COMMENT_PART_NAME);
   String exception_handled_part_name(EXCEPTION_HANDLED_PART_NAME);
   
 String *exception_var_name;  String charsets_name(CHARSETS_NAME);
 String *exception_type_part_name;  String mime_types_name(MIME_TYPES_NAME);
 String *exception_source_part_name;  String vfile_mime_type_name(VFILE_MIME_TYPE_NAME);
 String *exception_comment_part_name;  String origins_mode_name(ORIGINS_MODE_NAME);
 String *exception_handled_part_name;  
   
 String *charsets_name;  String class_path_name(CLASS_PATH_NAME);
 String *mime_types_name;  
 String *vfile_mime_type_name;  
 String *origins_mode_name;  
   
 String *class_path_name;  //^switch ^case
   String switch_data_name(SWITCH_DATA_NAME);
   
 String *switch_data_name;  //^cache
   String cache_data_name(CACHE_DATA_NAME);
   
 String *cache_data_name;  // sql
   String sql_limit_name(SQL_LIMIT_NAME);
   String sql_offset_name(SQL_OFFSET_NAME);
   String sql_default_name(SQL_DEFAULT_NAME);
   String sql_distinct_name(SQL_DISTINCT_NAME);
   
 String *sql_limit_name;  // charsets
 String *sql_offset_name;  String charset_UTF8_name(CHARSET_UTF8_NAME);
 String *sql_default_name;  
   
 String *charset_UTF8_name;  // hash
   String hash_default_element_name(HASH_DEFAULT_ELEMENT_NAME);
   
 String *hash_default_element_name;  // http
   String http_method_name(HTTP_METHOD_NAME);
   String http_timeout_name(HTTP_TIMEOUT_NAME);
   String http_headers_name(HTTP_HEADERS_NAME);
   String http_any_status_name(HTTP_ANY_STATUS_NAME);
   String file_status_name(FILE_STATUS_NAME);
   
 Array *string_match_table_columns;  
   
 Hash *untaint_lang_name2enum;  Table date_calendar_table_template;
   
 Charset *utf8_charset;  Charset utf8_charset;
   
 short hex_value[0x100];  short hex_value[0x100];
   
Line 249  xmlFileOpenLocalhost (const char *filena Line 322  xmlFileOpenLocalhost (const char *filena
  * Returns the number of bytes written   * Returns the number of bytes written
  */   */
 static int  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));      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:   * xmlFileClose:
  * @context:  the I/O context   * @context:  the I/O context
  *   *
  * Close an I/O channel   * Close an I/O channel
  */   */
 static int  static int
 xmlFileClose (void * context) {  pa_xmlFileClose (void * context) {
     return ( ( fclose((FILE *) context) == EOF ) ? -1 : 0 );      return ( ( fclose((FILE *) context) == EOF ) ? -1 : 0 );
 }  }
   
Line 297  void pa_globals_destroy(void *) { Line 355  void pa_globals_destroy(void *) {
         }          }
 }  }
   
 /// @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  /// @test hint on one should call this for each thread xmlSubstituteEntitiesDefault(1);
         #define NEW new(pool)  void pa_globals_init() {
   
         // hex value          // hex value
         setup_hex_value();          setup_hex_value();
   
         // names          // date_calendar_table_template
         content_type_name=NEW String(pool, CONTENT_TYPE_NAME);          {
         charset_name=NEW String(pool, CHARSET_NAME);                  Array *columns=NEW Array(pool);
         body_name=NEW String(pool, BODY_NAME);                  for(int i=0; i<=6; i++) {
         value_name=NEW String(pool, VALUE_NAME);                          char *column=(char *)pool.malloc(MAX_NUMBER);
         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);  
   
         unhandled_exception_method_name=NEW String(pool, UNHANDLED_EXCEPTION_METHOD_NAME);  
         post_process_method_name=NEW String(pool, POST_PROCESS_METHOD_NAME);  
   
         content_disposition_name=NEW String(pool, CONTENT_DISPOSITION_NAME);  
         content_disposition_filename_name=NEW String(pool, CONTENT_DISPOSITION_FILENAME_NAME);  
   
         auto_method_name=NEW String(pool, AUTO_METHOD_NAME);  
         main_method_name=NEW String(pool, MAIN_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  
                 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 *)malloc(MAX_NUMBER);  
                         snprintf(column, MAX_NUMBER, "%d", i);                          snprintf(column, MAX_NUMBER, "%d", i);
                         *string_match_table_columns+=NEW String(pool, column); // .i column name                          *columns+=NEW String(pool, column); // .i column name
                 }                  }
                   *columns+=NEW String(pool, DATE_CALENDAR_WEEKNO_NAME);
                   *columns+=NEW String(pool, DATE_CALENDAR_WEEKYEAR_NAME);
                   date_calendar_table_template=NEW Table(pool, 0, columns);
         }          }
   
         // charsets          // charsets
Line 440  void pa_globals_init(Pool& pool) { Line 424  void pa_globals_init(Pool& pool) {
         xmlLoadExtDtdDefaultValue |= XML_DETECT_IDS;          xmlLoadExtDtdDefaultValue |= XML_DETECT_IDS;
         // Bit in the loadsubset context field to tell to do complete the elements attributes lists           // Bit in the loadsubset context field to tell to do complete the elements attributes lists 
         // with the ones defaulted from the DTDs           // 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);  //regretfully this not only replaces entities on parse, but also on generate    xmlSubstituteEntitiesDefault(1);
         // never switched this on xmlIndentTreeOutput=1;          // never switched this on xmlIndentTreeOutput=1;
Line 454  void pa_globals_init(Pool& pool) { Line 441  void pa_globals_init(Pool& pool) {
         // http://localhost/abc -> $ENV{DOCUMENT_ROOT}/abc | ./abc          // http://localhost/abc -> $ENV{DOCUMENT_ROOT}/abc | ./abc
         xmlRegisterInputCallbacks(          xmlRegisterInputCallbacks(
                 xmlFileMatchLocalhost, xmlFileOpenLocalhost,                  xmlFileMatchLocalhost, xmlFileOpenLocalhost,
                 xmlFileRead, xmlFileClose);                  pa_xmlFileRead, pa_xmlFileClose);
   
         // XSLT stylesheet manager          // XSLT stylesheet manager
         cache_managers->put(*NEW String(pool, "stylesheet"),           cache_managers->put(*NEW String(pool, "stylesheet"), 
Line 463  void pa_globals_init(Pool& pool) { Line 450  void pa_globals_init(Pool& pool) {
 }  }
   
 #if defined(XML) && defined(_MSC_VER)  #if defined(XML) && defined(_MSC_VER)
 #       define XML_LIBS "/parser3project/win32xml"  #       define GNOME_LIBS "/parser3project/win32xml/win32/gnome"
 #       pragma comment(lib, XML_LIBS "/glib/lib/libglib-1.3-11.lib")  #       pragma comment(lib, GNOME_LIBS "/glib/lib/libglib-1.3-11.lib")
 #       ifdef _DEBUG  #       ifdef _DEBUG
 #               pragma comment(lib, XML_LIBS "/libxml2-x.x.x/win32/dsp/libxml2_so_debug/libxml2.lib")  #               pragma comment(lib, GNOME_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, GNOME_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, GNOME_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 "/gdome2-x.x.x/win32/dsp/Debug/libgdome.lib")
 #       else  #       else
 #               pragma comment(lib, XML_LIBS "/libxml2-x.x.x/win32/dsp/libxml2_so_release/libxml2.lib")  #               pragma comment(lib, GNOME_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, GNOME_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, GNOME_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 "/gdome2-x.x.x/win32/dsp/Release/libgdome.lib")
 #       endif  #       endif
 #endif  #endif

Removed from v.1.123  
changed lines
  Added in v.1.152.2.2


E-mail: