--- parser3/src/classes/xdoc.C 2001/10/22 16:44:42 1.32 +++ parser3/src/classes/xdoc.C 2001/10/29 13:04:46 1.38 @@ -4,7 +4,7 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - $Id: xdoc.C,v 1.32 2001/10/22 16:44:42 parser Exp $ + $Id: xdoc.C,v 1.38 2001/10/29 13:04:46 paf Exp $ */ #include "pa_types.h" #include "classes.h" @@ -77,7 +77,9 @@ static void _createElement(Request& r, c Pool& pool=r.pool(); VXdoc& vdoc=*static_cast(r.self); - const String& tagName=params->as_string(0, "tagName must be string"); + Temp_lang temp_lang(r, String::UL_XML); + Value& tagName_code=params->as_junction(0, "tagName must be string"); + const String& tagName=r.process(tagName_code).as_string(); try { XalanNode *node= @@ -109,7 +111,9 @@ static void _createTextNode(Request& r, Pool& pool=r.pool(); VXdoc& vdoc=*static_cast(r.self); - const String& data=params->as_string(0, "data must be string"); + Temp_lang temp_lang(r, String::UL_XML); + Value& data_code=params->as_junction(0, "data must be string"); + const String& data=r.process(data_code).as_string(); XalanNode *node= vdoc.get_document(pool, &method_name). @@ -381,7 +385,7 @@ static void create_optioned_listener( if(params->size()>index) { Value& voptions=params->as_no_junction(index, "options must be string"); if(voptions.is_defined()) { - if(Hash *options=voptions.get_hash()) { + if(Hash *options=voptions.get_hash(&method_name)) { // $.method[xml|html|text] if(Value *vmethod=static_cast(options->get(*new(pool) String(pool, XDOC_OUTPUT_METHOD_OPTION_NAME)))) @@ -611,79 +615,18 @@ static void _load(Request& r, const Stri vdoc.set_parsed_source(*parsedSource); } +/// @test lang=String::UL_UNSPECIFIED? static void add_xslt_param(const Hash::Key& aattribute, Hash::Val *ameaning, void *info) { XalanTransformer2& transformer=*static_cast(info); - const char *attribute_cstr=aattribute.cstr(); - const char *meaning_cstr=static_cast(ameaning)->as_string().cstr(); + const char *attribute_cstr=aattribute.cstr(String::UL_UNSPECIFIED); + const char *meaning_cstr=static_cast(ameaning)->as_string().cstr(String::UL_UNSPECIFIED); transformer.setStylesheetParam( XalanDOMString(attribute_cstr), XalanDOMString(meaning_cstr)); } -/* -static void _transform(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - VXdoc& vdoc=*static_cast(r.self); - - // params - if(params->size()>1) { - Value& vparams=params->as_no_junction(1, "transform parameters parameter must be string"); - if(vparams.is_defined()) - if(Hash *params=vparams.get_hash()) - params->for_each(add_xslt_param, &vdoc.transformer()); - else - throw Exception(0, 0, - &method_name, - "transform parameters parameter must be hash"); - } - - // source - const XalanParsedSource &parsed_source=vdoc.get_parsed_source(pool, &method_name); - - // stylesheet - const String& stylesheet_file_name=params->as_string(0, "file name must be string"); - const String& stylesheet_filespec=r.absolute(stylesheet_file_name); - //_asm int 3; - Stylesheet_connection& connection=XSLT_stylesheet_manager->get_connection(stylesheet_filespec); - - // target - XalanDocument* target=vdoc.parser_liaison().createDocument(); - - // transform - try { - vdoc.transformer().transform2( - parsed_source, - &connection.stylesheet(true/*nocache* /), - target); - } - catch (XSLException& e) { - connection.close(); - Exception::provide_source(pool, &stylesheet_file_name, e); - } - catch (SAXParseException& e) { - connection.close(); - Exception::provide_source(pool, &stylesheet_file_name, e); - } - catch (SAXException& e) { - connection.close(); - Exception::provide_source(pool, &stylesheet_file_name, e); - } - catch (XMLException& e) { - connection.close(); - Exception::provide_source(pool, &stylesheet_file_name, e); - } - catch(const XalanDOMException& e) { - connection.close(); - Exception::provide_source(pool, &stylesheet_file_name, e); - } - // write out result - VXdoc& result=*new(pool) VXdoc(pool); - result.set_document(*target); - r.write_no_lang(result); -} -*/ static void _transform(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); VXdoc& vdoc=*static_cast(r.self); @@ -692,7 +635,7 @@ static void _transform(Request& r, const if(params->size()>1) { Value& vparams=params->as_no_junction(1, "transform parameters parameter must be string"); if(vparams.is_defined()) - if(Hash *params=vparams.get_hash()) + if(Hash *params=vparams.get_hash(&method_name)) params->for_each(add_xslt_param, &vdoc.transformer()); else throw Exception(0, 0, @@ -700,9 +643,6 @@ static void _transform(Request& r, const "transform parameters parameter must be hash"); } - // source - XalanDocument &xalan_document=vdoc.get_document(pool, &method_name); - // stylesheet const String& stylesheet_file_name=params->as_string(0, "file name must be string"); const String& stylesheet_filespec=r.absolute(stylesheet_file_name); @@ -710,14 +650,27 @@ static void _transform(Request& r, const Stylesheet_connection& connection=stylesheet_manager->get_connection(stylesheet_filespec); // target - XalanDocument* target=vdoc.parser_liaison().createDocument(); + XalanDocument* target=vdoc.parser_xerces_liaison().createDocument(); // transform try { - vdoc.transformer().transform2( - &xalan_document, - &connection.stylesheet(true/*nocache*/), - target); + // note: + // actually, never found any difference between the two + // but still there some extra "xerces" words at start of transform body + // wich were originally "xalan" + // not daring to change that + if(vdoc.has_parsed_source()) { // set|load, not create? + vdoc.transformer().transform2( + vdoc.get_parsed_source(pool, &method_name), + &connection.stylesheet(true/*nocache*/), + target); + } else { + target=vdoc.parser_xerces_liaison().createDocument(); + vdoc.transformer().transform2( + vdoc.get_document(pool, &method_name), + &connection.stylesheet(true/*nocache*/), + target); + } } catch (XSLException& e) { connection.close(); @@ -840,7 +793,7 @@ Methoded *Xdoc_class; Methoded *MXdoc_create(Pool& pool) { return #ifdef XML - Xdoc_class=new(pool) MXdoc(pool); + Xdoc_class=new(pool) MXdoc(pool) #else 0 #endif