Diff for /parser3/src/main/pa_globals.C between versions 1.114 and 1.121

version 1.114, 2002/02/18 14:08:14 version 1.121, 2002/04/15 06:45:59
Line 10 Line 10
 #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 32  extern "C" { Line 29  extern "C" {
 #include "pa_charset.h"  #include "pa_charset.h"
 #include "pa_threads.h"  #include "pa_threads.h"
   
 #ifdef DB2  
 #include "pa_db_manager.h"  
 #endif  
   
 String *content_type_name;  String *content_type_name;
 String *charset_name;  String *charset_name;
 String *body_name;  String *body_name;
Line 46  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 *unhandled_exception_method_name;
 String *post_process_method_name;  String *post_process_method_name;
   
 String *content_disposition_name;  String *content_disposition_name;
Line 65  String *string_pre_match_name; Line 58  String *string_pre_match_name;
 String *string_match_name;  String *string_match_name;
 String *string_post_match_name;  String *string_post_match_name;
   
   String *exception_var_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;
 String *vfile_mime_type_name;  String *vfile_mime_type_name;
Line 73  String *origins_mode_name; Line 72  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 321  void pa_globals_init(Pool& pool) { Line 321  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);          unhandled_exception_method_name=NEW String(pool, UNHANDLED_EXCEPTION_METHOD_NAME);
         post_process_method_name=NEW String(pool, POST_PROCESS_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);
Line 340  void pa_globals_init(Pool& pool) { Line 340  void pa_globals_init(Pool& pool) {
         string_match_name=NEW String(pool, STRING_MATCH_NAME);          string_match_name=NEW String(pool, STRING_MATCH_NAME);
         string_post_match_name=NEW String(pool, STRING_POST_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);
Line 350  void pa_globals_init(Pool& pool) { Line 355  void pa_globals_init(Pool& pool) {
   
         //^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 393  void pa_globals_init(Pool& pool) { Line 400  void pa_globals_init(Pool& pool) {
         cache_managers->put(*NEW String(pool, "sql"),           cache_managers->put(*NEW String(pool, "sql"), 
                 SQL_driver_manager=NEW SQL_Driver_manager(pool));                  SQL_driver_manager=NEW SQL_Driver_manager(pool));
   
 #ifdef DB2  
         // DB driver manager  
         cache_managers->put(*NEW String(pool, "db"),   
                 DB_manager=NEW DB_Manager(pool));  
 #endif  
   
 #ifdef XML  #ifdef XML
         // initializing xml libs          // initializing xml libs
   
Line 472  void pa_globals_init(Pool& pool) { Line 473  void pa_globals_init(Pool& pool) {
 #               pragma comment(lib, XML_LIBS "/gdome2-x.x.x/win32/dsp/Release/libgdome.lib")  #               pragma comment(lib, XML_LIBS "/gdome2-x.x.x/win32/dsp/Release/libgdome.lib")
 #       endif  #       endif
 #endif  #endif
   
   
 #if defined(DB2) && defined(_MSC_VER)  
 #       define LIBDB2_WIN32_BUILD "/parser3project/win32db/lib"  
 #       ifdef _DEBUG  
 #               pragma comment(lib, LIBDB2_WIN32_BUILD "/debug/libdb.lib")  
 #       else  
 #               pragma comment(lib, LIBDB2_WIN32_BUILD "/release/libdb.lib")  
 #       endif  
 #endif  

Removed from v.1.114  
changed lines
  Added in v.1.121


E-mail: