--- parser3/src/main/pa_globals.C 2003/01/16 09:07:20 1.151 +++ parser3/src/main/pa_globals.C 2004/02/11 15:33:16 1.171 @@ -1,15 +1,16 @@ /** @file Parser: globals. - Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_GLOBALS_C="$Date: 2003/01/16 09:07:20 $"; +static const char * const IDENT_GLOBALS_C="$Date: 2004/02/11 15:33:16 $"; #include "pa_config_includes.h" #ifdef XML +#include "libxml/xmlversion.h" #include "libxslt/extensions.h" #include "libxslt/xsltutils.h" extern "C" { @@ -17,82 +18,22 @@ extern "C" { }; #endif +#include "pcre.h" + #include "pa_globals.h" #include "pa_string.h" -#include "pa_hash.h" -#include "pa_sql_driver_manager.h" -#include "pa_dictionary.h" -#include "pa_stylesheet_manager.h" #include "pa_sapi.h" -#include "pa_cache_managers.h" -#include "pa_charsets.h" -#include "pa_charset.h" #include "pa_threads.h" +#include "pa_xml_io.h" +#include "pa_common.h" -String *content_type_name; -String *charset_name; -String *body_name; -String *download_name; -String *value_name; -String *expires_name; -String *path_name; -String *name_name; -String *size_name; -String *text_name; - -String *content_disposition_name; -String *content_disposition_value; -String *content_disposition_filename_name; - -String *conf_method_name; -String *auto_method_name; - -String *main_class_name; - -String *result_var_name; -String *match_var_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; -String *vfile_mime_type_name; -String *origins_mode_name; - -String *class_path_name; - -String *switch_data_name; - -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; +#include "pa_cache_managers.h" -Table *date_calendar_table_template; +// defines -Hash *untaint_lang_name2enum; -Hash *exif_tag_value2name; +//#define PA_DEBUG_XML_GC_MEMORY -Charset *utf8_charset; +// globals short hex_value[0x100]; @@ -126,51 +67,57 @@ static void setup_hex_value() { hex_value['f'] = 15; } -#ifdef XML -const int MAX_CONCURRENT_XML_GENERIC_ERROR_THREADS=10; +Hash thread_request; +void pa_register_thread_request(Request& r) { + thread_request.put(pa_get_thread_id(), &r); +} +/// retrives request set by pa_set_request function, useful in contextless places [slow] +Request& pa_thread_request() { + return *thread_request.get(pa_get_thread_id()); +} -struct XML_Generic_error_info { - pa_thread_t thread_id; - char *message; -} xml_generic_error_infos[MAX_CONCURRENT_XML_GENERIC_ERROR_THREADS]; - -XML_Generic_error_info *xml_generic_error_info(pa_thread_t thread_id) { - for(int i=0; ithread_id==thread_id) - return p; +#ifdef XML + +class XML_Generic_error_info { +public: + char buf[MAX_STRING*5]; + size_t used; +public: + XML_Generic_error_info() { + reset(); } - return 0; -} + void reset() { + buf[used=0]=0; + } + const char* get_and_reset() { + if(used) { + char* result=pa_strdup(buf, used); + reset(); + return result; + } else + return 0; + } +}; + +Hash xml_generic_error_infos; -static void -xmlParserGenericErrorFunc(void *ctx, const char *msg, ...) { - pa_thread_t thread_id=pa_get_thread_id(); +static void xmlParserGenericErrorFunc(void * /*ctx*/, const char* msg, ...) { +//_asm int 3; + pa_thread_t thread_id=pa_get_thread_id(); // infinitely looking for free slot to fill it while(true) { SYNCHRONIZED; // find+fill blocked // first try to get existing for this thread_id - XML_Generic_error_info *p=xml_generic_error_info(thread_id); - if(!p) { // occupy empty one - p=xml_generic_error_info(0); - if(!p) // wait for empty for it to appear - continue; - } - - p->thread_id=thread_id; - size_t offset=p->message?strlen(p->message):0; - p->message=(char *)realloc(p->message, offset+MAX_STRING); - if(!p->message) - SAPI::die( - "out of memory in 'xmlParserGenericErrorFunc', failed to reallocate to %u bytes", - offset+MAX_STRING); + XML_Generic_error_info *p=xml_generic_error_infos.get(thread_id); + if(!p) // occupy empty one + xml_generic_error_infos.put(thread_id, (p=new(PointerFreeGC) XML_Generic_error_info)); va_list args; va_start(args, msg); - vsnprintf(p->message+offset, MAX_STRING, msg, args); + p->used+=vsnprintf(p->buf+p->used, sizeof(p->buf)-p->used, msg, args); va_end(args); break; @@ -178,366 +125,193 @@ xmlParserGenericErrorFunc(void *ctx, con } bool xmlHaveGenericErrors() { - pa_thread_t thread_id=pa_get_thread_id(); + pa_thread_t thread_id=pa_get_thread_id(); SYNCHRONIZED; // find blocked - return xml_generic_error_info(thread_id)!=0; + return xml_generic_error_infos.get(thread_id)!=0; } -const char *xmlGenericErrors() { - pa_thread_t thread_id=pa_get_thread_id(); +const char* xmlGenericErrors() { + pa_thread_t thread_id=pa_get_thread_id(); SYNCHRONIZED; // find+free blocked - XML_Generic_error_info *p=xml_generic_error_info(thread_id); - if(!p) // no errors for our thread_id registered - return 0; + if(XML_Generic_error_info *p=xml_generic_error_infos.get(thread_id)) + return p->get_and_reset(); - const char *result=p->message; + return 0; // no errors for our thread_id registered +} - // free slot up - memset(p, 0, sizeof(*p)); +#endif - // it is up to caller to free it - return result; +void pa_globals_destroy(void *) { + try { +#ifdef XML + GdomeException exc; + gdome_di_unref (domimpl, &exc); + // uncomment SAPI::abort below if adding potential-throw code here +#endif + } catch(const Exception& e) { +// SAPI::abort("pa_globals_destroy failed: %s", e.comment()); + } } -/** - * xmlFileMatchWithLocalhostEqDocumentRoot: - * filename: the URI for matching - * - * check if the URI matches an HTTP one - * - * Returns 1 if matches, 0 otherwise - */ -static int -xmlFileMatchLocalhost(const char *filename) { - if (!strncmp(filename, "http://localhost", 16)) - return(1); - return(0); -} +#ifdef XML -/** - * xmlFileOpenHttpLocalhost : - * filename: the URI for matching - * - * http://localhost/abc -> $ENV{DOCUMENT_ROOT}/abc | ./abc - * - * input from FILE *, supports compressed input - * if filename is " " then the standard input is used - * - * Returns an I/O context or NULL in case of error - */ -static void * -xmlFileOpenLocalhost (const char *filename) { - FILE *fd; - const char* documentRoot; - char path[1000]; - - path[0]=0; - strcat(path, (documentRoot=getenv("DOCUMENT_ROOT"))?documentRoot:"."); - strcat(path, &filename[16]); +static char *pa_GC_strdup(const char *s) { + if(!s) + return 0; -#ifdef WIN32 - fd = fopen(path, "rb"); -#else - fd = fopen(path, "r"); -#endif /* WIN32 */ - return((void *) fd); + size_t size=strlen(s)+1; + char *result=(char *)GC_MALLOC_ATOMIC(size); + if(!result) + SAPI::abort("out of memory (while duplicating XML string [size=%d])", size); + + memcpy(result, s, size); +#ifdef PA_DEBUG_XML_GC_MEMORY + fprintf(stderr, "pa_GC_strdup(%p=%s, length=%d)=0x%p\n", s, s, size, result); +#endif + return result; } -/** - * xmlFileRead: - * @context: the I/O context - * @buffer: where to drop data - * @len: number of bytes to write - * - * Read @len bytes to @buffer from the I/O channel. - * - * Returns the number of bytes written - */ -static int -pa_xmlFileRead (void * context, char * buffer, int len) { - return(fread(&buffer[0], 1, len, (FILE *) context)); +#ifdef PA_DEBUG_XML_GC_MEMORY +void *pa_look_for[]={(void*)0x8abe000,(void*)0x0,(void*)0x0,(void*)0x0, + (void*)0x0,(void*)0x0,(void*)0x0,(void*)0x0}; +bool pa_looked(void*p) { + for(int i=0; i<8; i++) + if(pa_look_for[i]==p) + return true; + return false; +} +static void* pa_gc_malloc_log(size_t size){ + void *p=pa_gc_malloc(size); + fprintf(stderr, "pa_gc_malloc_log(%d)=0x%p\n", size, p); +// if(pa_looked(p)) +// fprintf(stderr,"catched debug malloc(%d)=0x%p\n", size, p); + return p; + +} +static void* pa_gc_malloc_atomic_log(size_t size){ + void *p=pa_gc_malloc_atomic(size); + fprintf(stderr, "pa_gc_malloc_atomic_log(%d)=0x%p\n", size, p); +// if(pa_looked(p)) +// fprintf(stderr,"catched debug malloc atomic(%d)=0x%p\n", size, p); + return p; +} +static void* pa_gc_realloc_log(void *ptr, size_t size){ + void *p=pa_gc_realloc(ptr, size); + fprintf(stderr, "pa_gc_realloc_log(0x%p, %d)=0x%p\n", ptr, size, p); +// if(pa_looked(p)) +// fprintf(stderr,"catched debug realloc(%d)=0x%p\n", size, p); + return p; +} +//static void pa_gc_free_ignore(void *){} +static void pa_gc_free_log(void *p){ + fprintf(stderr, "pa_gc_free_log(0x%p)\n", p); +// if(pa_looked(p)) +// fprintf(stderr,"catched debug free(0x%p)\n", p); + pa_gc_free(p); } +#else -/** - * xmlFileClose: - * @context: the I/O context - * - * Close an I/O channel - */ -static int -pa_xmlFileClose (void * context) { - return ( ( fclose((FILE *) context) == EOF ) ? -1 : 0 ); +inline void *check(void *result, const char *where, size_t size) { + if(!result) + SAPI::abort("out of memory (while %s [size=%d])", where, size); + + return result; +} +static void* pa_gc_malloc_nonull(size_t size) { + return check(pa_gc_malloc(size), "allocating XML compsite memory", size); +} +static void* pa_gc_malloc_atomic_nonull(size_t size) { + return check(pa_gc_malloc_atomic(size), "allocating XML atomic memory", size); +} +static void* pa_gc_realloc_nonull(void* ptr, size_t size) { + return check(pa_gc_realloc(ptr, size), "reallocating XML memory", size); } #endif - -void pa_globals_destroy(void *) { - try { -#ifdef XML - GdomeException exc; - gdome_di_unref (domimpl, &exc); #endif - if(cache_managers) - cache_managers->~Cache_managers(); - charsets->~Charsets(); - - } catch(const Exception& e) { - SAPI::die("pa_globals_destroy failed: %s", e.comment()); - } +void pa_CORD_oom_fn(void) { + SAPI::abort("out of memory (while expanding string)"); } -/// @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); +/** + @todo gc: libltdl: substitute lt_dlmalloc & co +*/ +static void gc_substitute_memory_management_functions() { + // in libxml & libxslt +#ifdef XML + // asking to use GC memory +#if LIBXML_VERSION >= 20507 +#ifdef PA_DEBUG_XML_GC_MEMORY + xmlGcMemSetup( + /*xmlFreeFunc */pa_gc_free_log, + /*xmlMallocFunc */pa_gc_malloc_log, + /*xmlMallocFunc */pa_gc_malloc_atomic_log, + /*xmlReallocFunc */pa_gc_realloc_log, + /*xmlStrdupFunc */pa_GC_strdup); +#else + xmlGcMemSetup( + /*xmlFreeFunc */pa_gc_free, + /*xmlMallocFunc */pa_gc_malloc_nonull, + /*xmlMallocFunc */pa_gc_malloc_atomic_nonull, + /*xmlReallocFunc */pa_gc_realloc_nonull, + /*xmlStrdupFunc */pa_GC_strdup); +#endif - #undef NEW - #define NEW new(pool) +#else + xmlMemSetup( + /*xmlFreeFunc */pa_gc_free, + /*xmlMallocFunc */pa_gc_malloc, + /*xmlReallocFunc */pa_gc_realloc, + /*xmlStrdupFunc */pa_GC_strdup); +#endif - // hex value - setup_hex_value(); +#endif - // names - 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); - 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_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); - 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); - http_any_status_name=NEW String(pool, HTTP_ANY_STATUS_NAME); - file_status_name=NEW String(pool, FILE_STATUS_NAME); + // pcre + pcre_malloc=pa_gc_malloc; + pcre_free=pa_gc_free; - - // 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); - ULN("uri", URI); - ULN("table", TABLE); - 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); - - // 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); - } + // cord + CORD_oom_fn=pa_CORD_oom_fn; +} - // charsets - charsets=NEW Charsets(pool); - charsets->put(*charset_UTF8_name, - utf8_charset=NEW Charset(pool, *charset_UTF8_name, 0/*no file=system*/)); +/** + @test hint on one should call this for each thread xmlSubstituteEntitiesDefault(1); +*/ +void pa_globals_init() { + // global variables + cache_managers=new Cache_managers; - // Status registration, must be initialized before all registrants - cache_managers=NEW Cache_managers(pool); - - // SQL driver manager - cache_managers->put(*NEW String(pool, "sql"), - SQL_driver_manager=NEW SQL_Driver_manager(pool)); + // in various libraries + gc_substitute_memory_management_functions(); + + // hex value + setup_hex_value(); #ifdef XML // initializing xml libs - /* First I get a DOMImplementation reference */ + /* First get a DOMImplementation reference */ domimpl = gdome_di_mkref (); - /* - * Register the EXSLT extensions and the test module - */ - exsltRegisterAll(); - xsltRegisterTestModule(); - xmlDefaultSAXHandlerInit(); - /* - * disable CDATA from being built in the document tree - */ - // never added yet xmlDefaultSAXHandler.cdataBlock = NULL; - + /* + * Register the EXSLT extensions and the test module + */ + exsltRegisterAll(); + xsltRegisterTestModule(); + xmlDefaultSAXHandlerInit(); + /* + * disable CDATA from being built in the document tree + */ + // never added yet xmlDefaultSAXHandler.cdataBlock = NULL; + /* * Initialization function for the XML parser. * This is not reentrant. Call once before processing in case of @@ -558,7 +332,7 @@ 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 - xmlLoadExtDtdDefaultValue |= XML_COMPLETE_ATTRS; + xmlLoadExtDtdDefaultValue |= XML_COMPLETE_ATTRS; // validate each document after load/create (?) //xmlDoValidityCheckingDefaultValue = 1; @@ -566,35 +340,81 @@ void pa_globals_init(Pool& pool) { //regretfully this not only replaces entities on parse, but also on generate xmlSubstituteEntitiesDefault(1); // never switched this on xmlIndentTreeOutput=1; - memset(xml_generic_error_infos, 0, sizeof(xml_generic_error_infos)); xmlSetGenericErrorFunc(0, xmlParserGenericErrorFunc); xsltSetGenericErrorFunc(0, xmlParserGenericErrorFunc); // FILE *f=fopen("y:\\xslt.log", "wt"); // xsltSetGenericDebugFunc(f/*stderr*/, 0); - // http://localhost/abc -> $ENV{DOCUMENT_ROOT}/abc | ./abc - xmlRegisterInputCallbacks( - xmlFileMatchLocalhost, xmlFileOpenLocalhost, - pa_xmlFileRead, pa_xmlFileClose); - - // XSLT stylesheet manager - cache_managers->put(*NEW String(pool, "stylesheet"), - stylesheet_manager=NEW Stylesheet_manager(pool)); + pa_xml_io_init(); #endif } -#if defined(XML) && defined(_MSC_VER) -# define GNOME_LIBS "/parser3project/win32xml/win32/gnome" -# pragma comment(lib, GNOME_LIBS "/glib/lib/libglib-1.3-11.lib") +#ifdef _MSC_VER + +#ifndef PA_DEBUG_DISABLE_GC +# define GC_LIB "../../../../win32/gc" # ifdef _DEBUG -# 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") +# pragma comment(lib, GC_LIB "/Debug/gc.lib") # else -# 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") +# pragma comment(lib, GC_LIB "/Release/gc.lib") +# endif + +#endif + +#ifdef XML +# define GNOME_LIBS "../../../../win32/gnome" +# pragma comment(lib, GNOME_LIBS "/glib/lib/libglib-1.3-11.lib") +# ifdef _DEBUG + +# ifdef LIBXML_STATIC +# pragma comment(lib, GNOME_LIBS "/libxml2-x.x.x/win32/debug/lib/libxml2_a.lib") +# else +# pragma comment(lib, GNOME_LIBS "/libxml2-x.x.x/win32/debug/lib/libxml2.lib") +# endif + +# ifdef LIBXSLT_STATIC +# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/debug/lib/libxslt_a.lib") +# else +# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/debug/lib/libxslt.lib") +# endif +# ifdef LIBEXSLT_STATIC +# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/debug/lib/libexslt_a.lib") +# else +# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/debug/lib/libexslt.lib") +# endif + +# ifdef LIBGDOME_STATIC +# pragma comment(lib, GNOME_LIBS "/gdome2-x.x.x/win32/DebugStatic/libgdome.lib") +# else +# pragma comment(lib, GNOME_LIBS "/gdome2-x.x.x/win32/DebugDynamic/libgdome.lib") +# endif + +#else + +# ifdef LIBXML_STATIC +# pragma comment(lib, GNOME_LIBS "/libxml2-x.x.x/win32/release/lib/libxml2_a.lib") +# else +# pragma comment(lib, GNOME_LIBS "/libxml2-x.x.x/win32/release/lib/libxml2.lib") +# endif + +# ifdef LIBXSLT_STATIC +# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/release/lib/libxslt_a.lib") +# else +# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/release/lib/libxslt.lib") +# endif +# ifdef LIBEXSLT_STATIC +# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/release/lib/libexslt_a.lib") +# else +# pragma comment(lib, GNOME_LIBS "/libxslt-x.x.x/win32/release/lib/libexslt.lib") +# endif + +# ifdef LIBGDOME_STATIC +# pragma comment(lib, GNOME_LIBS "/gdome2-x.x.x/win32/ReleaseStatic/libgdome.lib") +# else +# pragma comment(lib, GNOME_LIBS "/gdome2-x.x.x/win32/ReleaseDynamic/libgdome.lib") +# endif + # endif #endif + +#endif