--- parser3/src/main/pa_globals.C 2002/08/01 11:41:18 1.134 +++ parser3/src/main/pa_globals.C 2003/04/04 09:08:24 1.154 @@ -1,11 +1,11 @@ /** @file 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 (http://paf.design.ru) */ -static const char* IDENT_GLOBALS_C="$Date: 2002/08/01 11:41:18 $"; +static const char* IDENT_GLOBALS_C="$Date: 2003/04/04 09:08:24 $"; #include "pa_config_includes.h" @@ -32,6 +32,7 @@ extern "C" { String *content_type_name; String *charset_name; String *body_name; +String *download_name; String *value_name; String *expires_name; String *path_name; @@ -40,6 +41,7 @@ String *size_name; String *text_name; String *content_disposition_name; +String *content_disposition_value; String *content_disposition_filename_name; String *conf_method_name; @@ -70,14 +72,25 @@ String *cache_data_name; String *sql_limit_name; String *sql_offset_name; String *sql_default_name; +String *sql_distinct_name; String *charset_UTF8_name; String *hash_default_element_name; +String *http_method_name; +String *http_timeout_name; +String *http_headers_name; +String *http_any_status_name; +String *file_status_name; + + Table *string_match_table_template; +Table *date_calendar_table_template; + Hash *untaint_lang_name2enum; +Hash *exif_tag_value2name; Charset *utf8_charset; @@ -246,33 +259,18 @@ xmlFileOpenLocalhost (const char *filena * Returns the number of bytes written */ 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)); } /** - * 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: * @context: the I/O context * * Close an I/O channel */ static int -xmlFileClose (void * context) { +pa_xmlFileClose (void * context) { return ( ( fclose((FILE *) context) == EOF ) ? -1 : 0 ); } @@ -308,6 +306,7 @@ void pa_globals_init(Pool& pool) { content_type_name=NEW String(pool, CONTENT_TYPE_NAME); charset_name=NEW String(pool, CHARSET_NAME); body_name=NEW String(pool, BODY_NAME); + download_name=NEW String(pool, DOWNLOAD_NAME); value_name=NEW String(pool, VALUE_NAME); expires_name=NEW String(pool, EXPIRES_NAME); path_name=NEW String(pool, PATH_NAME); @@ -316,6 +315,7 @@ void pa_globals_init(Pool& pool) { text_name=NEW String(pool, TEXT_NAME); content_disposition_name=NEW String(pool, CONTENT_DISPOSITION_NAME); + content_disposition_value=NEW String(pool, CONTENT_DISPOSITION_VALUE); content_disposition_filename_name=NEW String(pool, CONTENT_DISPOSITION_FILENAME_NAME); conf_method_name=NEW String(pool, CONF_METHOD_NAME); @@ -334,7 +334,6 @@ void pa_globals_init(Pool& pool) { 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); @@ -349,6 +348,7 @@ void pa_globals_init(Pool& pool) { 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); @@ -356,11 +356,20 @@ void pa_globals_init(Pool& pool) { // 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); + http_any_status_name=NEW String(pool, HTTP_ANY_STATUS_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, cstr), (int)String::UL_##LANG); ULN("as-is", AS_IS); + ULN("optimized-as-is", AS_IS|String::UL_OPTIMIZE_BIT); ULN("file-spec", FILE_SPEC); ULN("http-header", HTTP_HEADER); ULN("mail-header", MAIL_HEADER); @@ -369,21 +378,135 @@ void pa_globals_init(Pool& pool) { ULN("sql", SQL); ULN("js", JS); ULN("xml", XML); + ULN("optimized-xml", XML|String::UL_OPTIMIZE_BIT); 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); + // image JPEG Exif + exif_tag_value2name=NEW Hash(pool); + #define EXIF_TAG(tag, name) \ + { \ + char *buf=(char *)pool.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); - *string_match_table_columns+=NEW String(pool, column); // .i column name + *columns+=NEW String(pool, column); // .i column name } - string_match_table_template=NEW Table(pool, 0, string_match_table_columns); + 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); + *columns+=NEW String(pool, DATE_CALENDAR_WEEKYEAR_NAME); + date_calendar_table_template=NEW Table(pool, 0, columns); } // charsets @@ -435,7 +558,10 @@ void pa_globals_init(Pool& pool) { xmlLoadExtDtdDefaultValue |= XML_DETECT_IDS; // Bit in the loadsubset context field to tell to do complete the elements attributes lists // 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); // never switched this on xmlIndentTreeOutput=1; @@ -449,7 +575,7 @@ void pa_globals_init(Pool& pool) { // http://localhost/abc -> $ENV{DOCUMENT_ROOT}/abc | ./abc xmlRegisterInputCallbacks( xmlFileMatchLocalhost, xmlFileOpenLocalhost, - xmlFileRead, xmlFileClose); + pa_xmlFileRead, pa_xmlFileClose); // XSLT stylesheet manager cache_managers->put(*NEW String(pool, "stylesheet"), @@ -458,7 +584,7 @@ void pa_globals_init(Pool& pool) { } #if defined(XML) && defined(_MSC_VER) -# define GNOME_LIBS "/parser3project/win32xml/win32/gnome" +# define GNOME_LIBS "../../../../win32xml/win32/gnome" # pragma comment(lib, GNOME_LIBS "/glib/lib/libglib-1.3-11.lib") # ifdef _DEBUG # pragma comment(lib, GNOME_LIBS "/libxml2-x.x.x/win32/dsp/libxml2_so_debug/libxml2.lib")