--- parser3/src/main/pa_globals.C 2002/01/29 08:45:37 1.111 +++ parser3/src/main/pa_globals.C 2002/11/25 15:37:12 1.142 @@ -1,18 +1,15 @@ /** @file Parser: globals. - Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://paf.design.ru) - - $Id: pa_globals.C,v 1.111 2002/01/29 08:45:37 paf Exp $ + Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexandr Petrosian (http://paf.design.ru) */ +static const char* IDENT_GLOBALS_C="$Date: 2002/11/25 15:37:12 $"; + #include "pa_config_includes.h" #ifdef XML -//#include "libxml/parser.h" -//#include "libxslt/xslt.h" -//#include "libxslt/libxslt.h" #include "libxslt/extensions.h" #include "libxslt/xsltutils.h" extern "C" { @@ -32,10 +29,6 @@ extern "C" { #include "pa_charset.h" #include "pa_threads.h" -#ifdef DB2 -#include "pa_db_manager.h" -#endif - String *content_type_name; String *charset_name; String *body_name; @@ -46,24 +39,22 @@ String *name_name; String *size_name; String *text_name; -String *exception_method_name; -String *post_process_method_name; - String *content_disposition_name; String *content_disposition_filename_name; -String *unnamed_name; - +String *conf_method_name; String *auto_method_name; -String *main_method_name; String *main_class_name; String *result_var_name; String *match_var_name; -String *string_pre_match_name; -String *string_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 *mime_types_name; @@ -73,17 +64,30 @@ String *origins_mode_name; String *class_path_name; String *switch_data_name; -String *case_default_value; + +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 *file_status_name; + + +Table *string_match_table_template; + +Table *date_calendar_table_template; + Hash *untaint_lang_name2enum; +Hash *exif_tag_value2name; Charset *utf8_charset; @@ -321,41 +325,40 @@ void pa_globals_init(Pool& pool) { size_name=NEW String(pool, SIZE_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_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); - main_method_name=NEW String(pool, MAIN_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); - 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); 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); - case_default_value=NEW String(pool, CASE_DEFAULT_VALUE); + + //^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); @@ -363,7 +366,13 @@ 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); + file_status_name=NEW String(pool, FILE_STATUS_NAME); + // hashes untaint_lang_name2enum=NEW Hash(pool); #define ULN(cstr, LANG) \ @@ -380,6 +389,133 @@ void pa_globals_init(Pool& pool) { 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 + { + 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 charsets=NEW Charsets(pool); charsets->put(*charset_UTF8_name, @@ -393,12 +529,6 @@ void pa_globals_init(Pool& pool) { cache_managers->put(*NEW String(pool, "sql"), 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 // initializing xml libs @@ -435,7 +565,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; @@ -458,24 +591,17 @@ void pa_globals_init(Pool& pool) { } #if defined(XML) && defined(_MSC_VER) -# define XML_LIBS "/parser3project/win32xml" -# pragma comment(lib, XML_LIBS "/glib/lib/libglib-1.3-11.lib") -# pragma comment(lib, XML_LIBS "/libxml2-2.4.12/win32/dsp/libxml2_so/libxml2.lib") -# pragma comment(lib, XML_LIBS "/libxslt-1.0.9/win32/dsp/libexslt_so/libexslt.lib") -# pragma comment(lib, XML_LIBS "/libxslt-1.0.9/win32/dsp/libxslt_so/libxslt.lib") -# ifdef _DEBUG -# pragma comment(lib, XML_LIBS "/gdome2-0.7.0/win32/dsp/Debug/libgdome.lib") -# else -# pragma comment(lib, XML_LIBS "/gdome2-0.7.0/win32/dsp/Release/libgdome.lib") -# endif -#endif - - -#if defined(DB2) && defined(_MSC_VER) -# define LIBDB2_WIN32_BUILD "/parser3project/win32db/lib" +# define GNOME_LIBS "/parser3project/win32xml/win32/gnome" +# pragma comment(lib, GNOME_LIBS "/glib/lib/libglib-1.3-11.lib") # ifdef _DEBUG -# pragma comment(lib, LIBDB2_WIN32_BUILD "/debug/libdb.lib") +# pragma comment(lib, GNOME_LIBS "/libxml2-x.x.x/win32/dsp/libxml2_so_debug/libxml2.lib") +# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libexslt_so_debug/libexslt.lib") +# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libxslt_so_debug/libxslt.lib") +# pragma comment(lib, GNOME_LIBS "/gdome2-x.x.x/win32/dsp/Debug/libgdome.lib") # else -# pragma comment(lib, LIBDB2_WIN32_BUILD "/release/libdb.lib") +# pragma comment(lib, GNOME_LIBS "/libxml2-x.x.x/win32/dsp/libxml2_so_release/libxml2.lib") +# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libexslt_so_release/libexslt.lib") +# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/dsp/libxslt_so_release/libxslt.lib") +# pragma comment(lib, GNOME_LIBS "/gdome2-x.x.x/win32/dsp/Release/libgdome.lib") # endif #endif