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

version 1.143, 2002/11/26 15:09:12 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)
 */  */
   
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;  
 String *value_name;  
 String *expires_name;  
 String *path_name;  
 String *name_name;  
 String *size_name;  
 String *text_name;  
   
 String *content_disposition_name;  #define CONTENT_TYPE_NAME "content-type"
 String *content_disposition_filename_name;  #define CHARSET_NAME "charset"
   #define BODY_NAME "body"
   #define DOWNLOAD_NAME "download"
   #define VALUE_NAME "value"
   #define EXPIRES_NAME "expires"
   #define PATH_NAME "path"
   #define NAME_NAME "name"
   #define NONAME_DAT "noname.dat"
   #define SIZE_NAME "size"
   #define TEXT_NAME "text"
   
 String *conf_method_name;  #define CONF_METHOD_NAME "conf"
 String *auto_method_name;  #define AUTO_METHOD_NAME "auto"
   
 String *main_class_name;  #define MAIN_CLASS_NAME "MAIN"
   
 String *result_var_name;  #define DEFAULTS_NAME "DEFAULTS"
 String *match_var_name;  #define CHARSETS_NAME "CHARSETS"
   #define MIME_TYPES_NAME "MIME-TYPES"
   #define ORIGINS_MODE_NAME "ORIGINS"
   
 String *exception_var_name;  #define RESULT_VAR_NAME "result"
 String *exception_type_part_name;  #define MATCH_VAR_NAME "match"
 String *exception_source_part_name;  
 String *exception_comment_part_name;  
 String *exception_handled_part_name;  
   
 String *charsets_name;  #define EXCEPTION_VAR_NAME "exception"
 String *mime_types_name;  #define EXCEPTION_TYPE_PART_NAME "type"
 String *vfile_mime_type_name;  #define EXCEPTION_SOURCE_PART_NAME "source"
 String *origins_mode_name;  #define EXCEPTION_COMMENT_PART_NAME "comment"
   #define EXCEPTION_HANDLED_PART_NAME "handled"
   
 String *class_path_name;  
   
 String *switch_data_name;  #define DATE_CALENDAR_WEEKNO_NAME "week"
   #define DATE_CALENDAR_WEEKYEAR_NAME "year"
   
 String *cache_data_name;  #define CONTENT_DISPOSITION_NAME "content-disposition"
   #define CONTENT_DISPOSITION_VALUE "attachment"
   #define CONTENT_DISPOSITION_FILENAME_NAME "filename"
   
 String *sql_limit_name;  #define SWITCH_DATA_NAME "SWITCH-DATA"
 String *sql_offset_name;  
 String *sql_default_name;  
 String *sql_distinct_name;  
   
 String *charset_UTF8_name;  #define CACHE_DATA_NAME "CACHE-DATA"
   
 String *hash_default_element_name;  #define CLASS_PATH_NAME "CLASS_PATH"
   
 String *http_method_name;  #define SQL_LIMIT_NAME "limit"
 String *http_timeout_name;  #define SQL_OFFSET_NAME "offset"
 String *http_headers_name;  #define SQL_DEFAULT_NAME "default"
 String *file_status_name;  #define SQL_DISTINCT_NAME "distinct"
   
   #define CHARSET_UTF8_NAME "UTF-8"
   
 Table *string_match_table_template;  #define HASH_DEFAULT_ELEMENT_NAME "_default"
   
 Table *date_calendar_table_template;  #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"
   
 Hash *untaint_lang_name2enum;  String content_type_name(CONTENT_TYPE_NAME);
 Hash *exif_tag_value2name;  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);
   
 Charset *utf8_charset;  String content_disposition_name(CONTENT_DISPOSITION_NAME);
   String content_disposition_value(CONTENT_DISPOSITION_VALUE);
   String content_disposition_filename_name(CONTENT_DISPOSITION_FILENAME_NAME);
   
   String conf_method_name(CONF_METHOD_NAME);
   String auto_method_name(AUTO_METHOD_NAME);
   
   String main_class_name(MAIN_CLASS_NAME);
   
   String result_var_name(RESULT_VAR_NAME);
   String match_var_name(MATCH_VAR_NAME);
   
   String exception_var_name(EXCEPTION_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 charsets_name(CHARSETS_NAME);
   String mime_types_name(MIME_TYPES_NAME);
   String vfile_mime_type_name(VFILE_MIME_TYPE_NAME);
   String origins_mode_name(ORIGINS_MODE_NAME);
   
   String class_path_name(CLASS_PATH_NAME);
   
   //^switch ^case
   String switch_data_name(SWITCH_DATA_NAME);
   
   //^cache
   String cache_data_name(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);
   
   // charsets
   String charset_UTF8_name(CHARSET_UTF8_NAME);
   
   // hash
   String hash_default_element_name(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);
   
   
   Table date_calendar_table_template;
   
   Charset utf8_charset;
   
 short hex_value[0x100];  short hex_value[0x100];
   
Line 256  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 304  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  
         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);  
         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);  
         sql_distinct_name=NEW String(pool, SQL_DISTINCT_NAME);  
   
         // charsets  
         charset_UTF8_name=NEW String(pool, CHARSET_UTF8_NAME);  
   
         // hash  
         hash_default_element_name=NEW String(pool, HASH_DEFAULT_ELEMENT_NAME);  
   
         // http  
         http_method_name=NEW String(pool, HTTP_METHOD_NAME);  
         http_timeout_name=NEW String(pool, HTTP_TIMEOUT_NAME);  
         http_headers_name=NEW String(pool, HTTP_HEADERS_NAME);  
         file_status_name=NEW String(pool, FILE_STATUS_NAME);  
   
           
         // hashes  
         untaint_lang_name2enum=NEW Hash(pool);  
         #define ULN(cstr, LANG) \  
                 untaint_lang_name2enum->put(*NEW String(pool, (void *)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);  
   
         // image JPEG Exif  
         exif_tag_value2name=NEW Hash(pool);  
         #define EXIF_TAG(tag, name) \  
                 { \  
                         char *buf=(char *)malloc(MAX_NUMBER); \  
                         snprintf(buf, MAX_NUMBER, "%u", tag); \  
                         exif_tag_value2name->put(*NEW String(pool, buf), (void *)#name); \  
                 }  
         // Tags used by IFD0 (main image)  
         EXIF_TAG(0x010e,        ImageDescription);  
         EXIF_TAG(0x010f,        Make);  
         EXIF_TAG(0x0110,        Model);  
         EXIF_TAG(0x0112,        Orientation);  
         EXIF_TAG(0x011a,        XResolution);  
         EXIF_TAG(0x011b,        YResolution);  
         EXIF_TAG(0x0128,        ResolutionUnit);  
         EXIF_TAG(0x0131,        Software);  
         EXIF_TAG(0x0132,        DateTime);  
         EXIF_TAG(0x013e,        WhitePoint);  
         EXIF_TAG(0x013f,        PrimaryChromaticities);  
         EXIF_TAG(0x0211,        YCbCrCoefficients);  
         EXIF_TAG(0x0213,        YCbCrPositioning);  
         EXIF_TAG(0x0214,        ReferenceBlackWhite);  
         EXIF_TAG(0x8298,        Copyright);  
         EXIF_TAG(0x8769,        ExifOffset);  
         // Tags used by Exif SubIFD  
         EXIF_TAG(0x829a,        ExposureTime);  
         EXIF_TAG(0x829d,        FNumber);  
         EXIF_TAG(0x8822,        ExposureProgram);  
         EXIF_TAG(0x8827,        ISOSpeedRatings);  
         EXIF_TAG(0x9000,        ExifVersion);  
         EXIF_TAG(0x9003,        DateTimeOriginal);  
         EXIF_TAG(0x9004,        DateTimeDigitized);  
         EXIF_TAG(0x9101,        ComponentsConfiguration);  
         EXIF_TAG(0x9102,        CompressedBitsPerPixel);  
         EXIF_TAG(0x9201,        ShutterSpeedValue);  
         EXIF_TAG(0x9202,        ApertureValue);  
         EXIF_TAG(0x9203,        BrightnessValue);  
         EXIF_TAG(0x9204,        ExposureBiasValue);  
         EXIF_TAG(0x9205,        MaxApertureValue);  
         EXIF_TAG(0x9206,        SubjectDistance);  
         EXIF_TAG(0x9207,        MeteringMode);  
         EXIF_TAG(0x9208,        LightSource);  
         EXIF_TAG(0x9209,        Flash);  
         EXIF_TAG(0x920a,        FocalLength);  
         EXIF_TAG(0x927c,        MakerNote);  
         EXIF_TAG(0x9286,        UserComment);  
         EXIF_TAG(0x9290,        SubsecTime);  
         EXIF_TAG(0x9291,        SubsecTimeOriginal);  
         EXIF_TAG(0x9292,        SubsecTimeDigitized);  
         EXIF_TAG(0xa000,        FlashPixVersion);  
         EXIF_TAG(0xa001,        ColorSpace);  
         EXIF_TAG(0xa002,        ExifImageWidth);  
         EXIF_TAG(0xa003,        ExifImageHeight);  
         EXIF_TAG(0xa004,        RelatedSoundFile);  
         EXIF_TAG(0xa005,        ExifInteroperabilityOffset);  
         EXIF_TAG(0xa20e,        FocalPlaneXResolution);  
         EXIF_TAG(0xa20f,        FocalPlaneYResolution);  
         EXIF_TAG(0xa210,        FocalPlaneResolutionUnit);  
         EXIF_TAG(0xa215,        ExposureIndex);  
         EXIF_TAG(0xa217,        SensingMethod);  
         EXIF_TAG(0xa300,        FileSource);  
         EXIF_TAG(0xa301,        SceneType);  
         EXIF_TAG(0xa302,        CFAPattern);  
         // Misc Tags  
         EXIF_TAG(0x00fe,        NewSubfileType);  
         EXIF_TAG(0x00ff,        SubfileType);  
         EXIF_TAG(0x012d,        TransferFunction);  
         EXIF_TAG(0x013b,        Artist);  
         EXIF_TAG(0x013d,        Predictor);  
         EXIF_TAG(0x0142,        TileWidth);  
         EXIF_TAG(0x0143,        TileLength);  
         EXIF_TAG(0x0144,        TileOffsets);  
         EXIF_TAG(0x0145,        TileByteCounts);  
         EXIF_TAG(0x014a,        SubIFDs);  
         EXIF_TAG(0x015b,        JPEGTables);  
         EXIF_TAG(0x828d,        CFARepeatPatternDim);  
         EXIF_TAG(0x828e,        CFAPattern);  
         EXIF_TAG(0x828f,        BatteryLevel);  
         EXIF_TAG(0x83bb,        IPTC/NAA);  
         EXIF_TAG(0x8773,        InterColorProfile);  
         EXIF_TAG(0x8824,        SpectralSensitivity);  
         EXIF_TAG(0x8825,        GPSInfo);  
         EXIF_TAG(0x8828,        OECF);  
         EXIF_TAG(0x8829,        Interlace);  
         EXIF_TAG(0x882a,        TimeZoneOffset);  
         EXIF_TAG(0x882b,        SelfTimerMode);  
         EXIF_TAG(0x920b,        FlashEnergy);  
         EXIF_TAG(0x920c,        SpatialFrequencyResponse);  
         EXIF_TAG(0x920d,        Noise);  
         EXIF_TAG(0x9211,        ImageNumber);  
         EXIF_TAG(0x9212,        SecurityClassification);  
         EXIF_TAG(0x9213,        ImageHistory);  
         EXIF_TAG(0x9214,        SubjectLocation);  
         EXIF_TAG(0x9215,        ExposureIndex);  
         EXIF_TAG(0x9216,        TIFF/EPStandardID);  
         EXIF_TAG(0xa20b,        FlashEnergy);  
         EXIF_TAG(0xa20c,        SpatialFrequencyResponse);  
         EXIF_TAG(0xa214,        SubjectLocation);  
   
         // 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          // date_calendar_table_template
         {          {
                 Array *columns=NEW Array(pool);                  Array *columns=NEW Array(pool);
Line 582  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"), 

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


E-mail: