[BACK]Return to pa_globals.C CVS log [TXT] [DIR] Up to [parser3project] / parser3 / src / main

Diff for /parser3/src/main/pa_globals.C between versions 1.117 and 1.136

version 1.117, 2002/02/22 10:11:33 version 1.136, 2002/08/06 09:07:59
Line 3 Line 3
   
         Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)          Copyright (c) 2001, 2002 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
 //#include "libxml/parser.h"  
 //#include "libxslt/xslt.h"  
 //#include "libxslt/libxslt.h"  
 #include "libxslt/extensions.h"  #include "libxslt/extensions.h"
 #include "libxslt/xsltutils.h"  #include "libxslt/xsltutils.h"
 extern "C" {  extern "C" {
Line 42  String *name_name; Line 39  String *name_name;
 String *size_name;  String *size_name;
 String *text_name;  String *text_name;
   
 String *exception_method_name;  
 String *post_process_method_name;  
   
 String *content_disposition_name;  String *content_disposition_name;
 String *content_disposition_filename_name;  String *content_disposition_filename_name;
   
 String *unnamed_name;  String *conf_method_name;
   
 String *auto_method_name;  String *auto_method_name;
 String *main_method_name;  
   
 String *main_class_name;  String *main_class_name;
   
 String *result_var_name;  String *result_var_name;
 String *match_var_name;  String *match_var_name;
 String *string_pre_match_name;  
 String *string_match_name;  String *exception_var_name;
 String *string_post_match_name;  String *exception_type_part_name;
   String *exception_source_part_name;
   String *exception_comment_part_name;
   String *exception_handled_part_name;
   
 String *charsets_name;  String *charsets_name;
 String *mime_types_name;  String *mime_types_name;
Line 69  String *origins_mode_name; Line 64  String *origins_mode_name;
 String *class_path_name;  String *class_path_name;
   
 String *switch_data_name;  String *switch_data_name;
 String *case_default_value;  
   String *cache_data_name;
   
 String *sql_limit_name;  String *sql_limit_name;
 String *sql_offset_name;  String *sql_offset_name;
Line 79  String *charset_UTF8_name; Line 75  String *charset_UTF8_name;
   
 String *hash_default_element_name;  String *hash_default_element_name;
   
   Table *string_match_table_template;
   
   Table *date_calendar_table_template;
   
 Hash *untaint_lang_name2enum;  Hash *untaint_lang_name2enum;
   
 Charset *utf8_charset;  Charset *utf8_charset;
Line 317  void pa_globals_init(Pool& pool) { Line 317  void pa_globals_init(Pool& pool) {
         size_name=NEW String(pool, SIZE_NAME);          size_name=NEW String(pool, SIZE_NAME);
         text_name=NEW String(pool, TEXT_NAME);          text_name=NEW String(pool, TEXT_NAME);
   
         exception_method_name=NEW String(pool, 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_name=NEW String(pool, CONTENT_DISPOSITION_NAME);
         content_disposition_filename_name=NEW String(pool, CONTENT_DISPOSITION_FILENAME_NAME);          content_disposition_filename_name=NEW String(pool, CONTENT_DISPOSITION_FILENAME_NAME);
   
         unnamed_name=NEW String(pool, UNNAMED_NAME);          conf_method_name=NEW String(pool, CONF_METHOD_NAME);
   
         auto_method_name=NEW String(pool, AUTO_METHOD_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);          main_class_name=NEW String(pool, MAIN_CLASS_NAME);
   
         result_var_name=NEW String(pool, RESULT_VAR_NAME);          result_var_name=NEW String(pool, RESULT_VAR_NAME);
         match_var_name=NEW String(pool, MATCH_VAR_NAME);          match_var_name=NEW String(pool, MATCH_VAR_NAME);
         string_pre_match_name=NEW String(pool, STRING_PRE_MATCH_NAME);  
         string_match_name=NEW String(pool, STRING_MATCH_NAME);  
         string_post_match_name=NEW String(pool, STRING_POST_MATCH_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);          charsets_name=NEW String(pool, CHARSETS_NAME);
         mime_types_name=NEW String(pool, MIME_TYPES_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);          origins_mode_name=NEW String(pool, ORIGINS_MODE_NAME);
   
         class_path_name=NEW String(pool, CLASS_PATH_NAME);          class_path_name=NEW String(pool, CLASS_PATH_NAME);
   
         //^switch ^case          //^switch ^case
         switch_data_name=NEW String(pool, SWITCH_DATA_NAME);          switch_data_name=NEW String(pool, SWITCH_DATA_NAME);
         case_default_value=NEW String(pool, CASE_DEFAULT_VALUE);  
           //^cache
           cache_data_name=NEW String(pool, CACHE_DATA_NAME);
   
         // sql          // sql
         sql_limit_name=NEW String(pool, SQL_LIMIT_NAME);          sql_limit_name=NEW String(pool, SQL_LIMIT_NAME);
Line 359  void pa_globals_init(Pool& pool) { Line 357  void pa_globals_init(Pool& pool) {
         // hash          // hash
         hash_default_element_name=NEW String(pool, HASH_DEFAULT_ELEMENT_NAME);          hash_default_element_name=NEW String(pool, HASH_DEFAULT_ELEMENT_NAME);
   
   
         // hashes          // hashes
         untaint_lang_name2enum=NEW Hash(pool);          untaint_lang_name2enum=NEW Hash(pool);
         #define ULN(cstr, LANG) \          #define ULN(cstr, LANG) \
Line 376  void pa_globals_init(Pool& pool) { Line 373  void pa_globals_init(Pool& pool) {
         ULN("html", HTML);          ULN("html", HTML);
         ULN("optimized-html", HTML|String::UL_OPTIMIZE_BIT);          ULN("optimized-html", HTML|String::UL_OPTIMIZE_BIT);
   
           // string_match_table_template
           {
                   Array *columns=NEW Array(pool);
                   *columns+=NEW String(pool, STRING_PRE_MATCH_NAME);
                   *columns+=NEW String(pool, STRING_MATCH_NAME);
                   *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);
                           *columns+=NEW String(pool, column); // .i column name
                   }
                   string_match_table_template=NEW Table(pool, 0, columns);
           }
   
           // date_calendar_table_template
           {
                   Array *columns=NEW Array(pool);
                   for(int i=0; i<=6; i++) {
                           char *column=(char *)pool.malloc(MAX_NUMBER);
                           snprintf(column, MAX_NUMBER, "%d", i);
                           *columns+=NEW String(pool, column); // .i column name
                   }
                   *columns+=NEW String(pool, DATE_CALENDAR_WEEKNO_NAME);
                   date_calendar_table_template=NEW Table(pool, 0, columns);
           }
   
         // charsets          // charsets
         charsets=NEW Charsets(pool);          charsets=NEW Charsets(pool);
         charsets->put(*charset_UTF8_name,           charsets->put(*charset_UTF8_name, 
Line 448  void pa_globals_init(Pool& pool) { Line 471  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.117  
changed lines
  Added in v.1.136

E-mail: