Diff for /parser3/src/main/pa_globals.C between versions 1.128 and 1.152.2.13

version 1.128, 2002/06/12 10:58:42 version 1.152.2.13, 2003/02/04 12:08:57
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 19  extern "C" { Line 19  extern "C" {
   
 #include "pa_globals.h"  #include "pa_globals.h"
 #include "pa_string.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_sapi.h"
 #include "pa_cache_managers.h"  
 #include "pa_charsets.h"  
 #include "pa_charset.h"  
 #include "pa_threads.h"  #include "pa_threads.h"
   
 String *content_type_name;  #ifdef XML
 String *charset_name;  #include "pa_stylesheet_manager.h"
 String *body_name;  #endif
 String *value_name;  
 String *expires_name;  
 String *path_name;  
 String *name_name;  
 String *size_name;  
 String *text_name;  
   
 String *content_disposition_name;  #define DEFAULTS_NAME "DEFAULTS"
 String *content_disposition_filename_name;  
   
 String *conf_method_name;  #define MATCH_VAR_NAME "match"
 String *auto_method_name;  
   
 String *main_class_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 *result_var_name;  
 String *match_var_name;  
   
 String *exception_var_name;  #define DATE_CALENDAR_WEEKNO_NAME "week"
 String *exception_type_part_name;  #define DATE_CALENDAR_WEEKYEAR_NAME "year"
 String *exception_source_part_name;  
 String *exception_comment_part_name;  
 String *exception_handled_part_name;  
   
 String *charsets_name;  
 String *mime_types_name;  
 String *vfile_mime_type_name;  
 String *origins_mode_name;  
   
 String *class_path_name;  #define SWITCH_DATA_NAME "SWITCH-DATA"
   
 String *switch_data_name;  #define CACHE_DATA_NAME "CACHE-DATA"
   
 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;  #define HASH_DEFAULT_ELEMENT_NAME "_default"
 String *sql_offset_name;  
 String *sql_default_name;  
   
 String *charset_UTF8_name;  
   
 String *hash_default_element_name;  StringPtr match_var_name(new String(MATCH_VAR_NAME));
   
 Table *string_match_table_template;  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));
   
 Hash *untaint_lang_name2enum;  
   
 Charset *utf8_charset;  //^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));
   
 short hex_value[0x100];  short hex_value[0x100];
   
Line 132  XML_Generic_error_info *xml_generic_erro Line 131  XML_Generic_error_info *xml_generic_erro
 }  }
   
 static void  static void
 xmlParserGenericErrorFunc(void *ctx, const char *msg, ...) {   xmlParserGenericErrorFunc(void *ctx, const char* msg, ...) { 
     pa_thread_t thread_id=pa_get_thread_id();      pa_thread_t thread_id=pa_get_thread_id();
   
         // infinitely looking for free slot to fill it          // infinitely looking for free slot to fill it
Line 172  bool xmlHaveGenericErrors() { Line 171  bool xmlHaveGenericErrors() {
         return xml_generic_error_info(thread_id)!=0;          return xml_generic_error_info(thread_id)!=0;
 }  }
   
 const char *xmlGenericErrors() {  const char* xmlGenericErrors() {
     pa_thread_t thread_id=pa_get_thread_id();      pa_thread_t thread_id=pa_get_thread_id();
   
         SYNCHRONIZED;  // find+free blocked          SYNCHRONIZED;  // find+free blocked
Line 181  const char *xmlGenericErrors() { Line 180  const char *xmlGenericErrors() {
         if(!p) // no errors for our thread_id registered          if(!p) // no errors for our thread_id registered
                 return 0;                  return 0;
   
         const char *result=p->message;          const char* result=p->message;
   
         // free slot up           // free slot up 
         memset(p, 0, sizeof(*p));          memset(p, 0, sizeof(*p));
Line 199  const char *xmlGenericErrors() { Line 198  const char *xmlGenericErrors() {
  * Returns 1 if matches, 0 otherwise   * Returns 1 if matches, 0 otherwise
  */   */
 static int  static int
 xmlFileMatchLocalhost(const char *filename) {  xmlFileMatchLocalhost(const char* filename) {
     if (!strncmp(filename, "http://localhost", 16))      if (!strncmp(filename, "http://localhost", 16))
         return(1);          return(1);
     return(0);      return(0);
Line 218  xmlFileMatchLocalhost(const char *filena Line 217  xmlFileMatchLocalhost(const char *filena
  * Returns an I/O context or NULL in case of error   * Returns an I/O context or NULL in case of error
  */   */
 static void *  static void *
 xmlFileOpenLocalhost (const char *filename) {  xmlFileOpenLocalhost (const char* filename) {
     FILE *fd;      FILE *fd;
     const char* documentRoot;      const char* documentRoot;
     char path[1000];      char path[1000];
Line 246  xmlFileOpenLocalhost (const char *filena Line 245  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 284  void pa_globals_destroy(void *) { Line 268  void pa_globals_destroy(void *) {
                 GdomeException exc;                  GdomeException exc;
                 gdome_di_unref (domimpl, &exc);                  gdome_di_unref (domimpl, &exc);
 #endif  #endif
                 if(cache_managers)  
                         cache_managers->~Cache_managers();  
   
                 charsets->~Charsets();  
                   
         } catch(const Exception& e) {          } catch(const Exception& e) {
                 SAPI::die("pa_globals_destroy failed: %s", e.comment());                  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  /// @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  
         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);  
   
         conf_method_name=NEW String(pool, CONF_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  #ifdef XML
         // initializing xml libs          // initializing xml libs
   
Line 435  void pa_globals_init(Pool& pool) { Line 316  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 449  void pa_globals_init(Pool& pool) { Line 333  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 458  void pa_globals_init(Pool& pool) { Line 342  void pa_globals_init(Pool& pool) {
 }  }
   
 #if defined(XML) && defined(_MSC_VER)  #if defined(XML) && defined(_MSC_VER)
 #       define XML_LIBS "/parser3project/win32/xml"  #       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.128  
changed lines
  Added in v.1.152.2.13


E-mail: