--- parser3/src/classes/xdoc.C 2001/10/19 14:42:53 1.30 +++ parser3/src/classes/xdoc.C 2001/11/12 10:00:31 1.45 @@ -2,9 +2,9 @@ Parser: @b xdoc parser class. Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://design.ru/paf) + Author: Alexander Petrosyan (http://paf.design.ru) - $Id: xdoc.C,v 1.30 2001/10/19 14:42:53 parser Exp $ + $Id: xdoc.C,v 1.45 2001/11/12 10:00:31 paf Exp $ */ #include "pa_types.h" #include "classes.h" @@ -12,7 +12,7 @@ #include "pa_request.h" #include "pa_vxdoc.h" -#include "pa_xslt_stylesheet_manager.h" +#include "pa_stylesheet_manager.h" #include "pa_stylesheet_connection.h" #include "pa_vfile.h" #include "xnode.h" @@ -84,10 +84,10 @@ static void _createElement(Request& r, c vdoc.get_document(pool, &method_name). createElement(*pool.transcode(tagName)); // write out result - VXnode& result=*new(pool) VXnode(pool, node); + VXnode& result=*new(pool) VXnode(pool, node, false); r.write_no_lang(result); } catch(const XalanDOMException& e) { - Exception::convert(pool, &method_name, e); + Exception::provide_source(pool, &method_name, e); } } @@ -100,7 +100,7 @@ static void _createDocumentFragment(Requ vdoc.get_document(pool, &method_name). createDocumentFragment(); // write out result - VXnode& result=*new(pool) VXnode(pool, node); + VXnode& result=*new(pool) VXnode(pool, node, false); r.write_no_lang(result); } @@ -115,7 +115,7 @@ static void _createTextNode(Request& r, vdoc.get_document(pool, &method_name). createTextNode(*pool.transcode(data)); // write out result - VXnode& result=*new(pool) VXnode(pool, node); + VXnode& result=*new(pool) VXnode(pool, node, false); r.write_no_lang(result); } @@ -130,7 +130,7 @@ static void _createComment(Request& r, c vdoc.get_document(pool, &method_name). createComment(*pool.transcode(data)); // write out result - VXnode& result=*new(pool) VXnode(pool, node); + VXnode& result=*new(pool) VXnode(pool, node, false); r.write_no_lang(result); } @@ -146,10 +146,10 @@ static void _createCDATASection(Request& vdoc.get_document(pool, &method_name). createCDATASection(*pool.transcode(data)); // write out result - VXnode& result=*new(pool) VXnode(pool, node); + VXnode& result=*new(pool) VXnode(pool, node, false); r.write_no_lang(result); } catch(const XalanDOMException& e) { - Exception::convert(pool, &method_name, e); + Exception::provide_source(pool, &method_name, e); } } @@ -166,10 +166,10 @@ static void _createProcessingInstruction vdoc.get_document(pool, &method_name). createProcessingInstruction(*pool.transcode(target), *pool.transcode(data)); // write out result - VXnode& result=*new(pool) VXnode(pool, node); + VXnode& result=*new(pool) VXnode(pool, node, false); r.write_no_lang(result); } catch(const XalanDOMException& e) { - Exception::convert(pool, &method_name, e); + Exception::provide_source(pool, &method_name, e); } } @@ -185,10 +185,10 @@ static void _createAttribute(Request& r, vdoc.get_document(pool, &method_name). createAttribute(*pool.transcode(name)); // write out result - VXnode& result=*new(pool) VXnode(pool, node); + VXnode& result=*new(pool) VXnode(pool, node, false); r.write_no_lang(result); } catch(const XalanDOMException& e) { - Exception::convert(pool, &method_name, e); + Exception::provide_source(pool, &method_name, e); } } // EntityReference createEntityReference(in DOMString name) raises(DOMException); @@ -203,10 +203,10 @@ static void _createEntityReference(Reque vdoc.get_document(pool, &method_name). createEntityReference(*pool.transcode(name)); // write out result - VXnode& result=*new(pool) VXnode(pool, node); + VXnode& result=*new(pool) VXnode(pool, node, false); r.write_no_lang(result); } catch(const XalanDOMException& e) { - Exception::convert(pool, &method_name, e); + Exception::provide_source(pool, &method_name, e); } } @@ -381,7 +381,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)))) @@ -452,7 +452,7 @@ static void _save(Request& r, const Stri FormatterTreeWalker treeWalker(*formatterListener); treeWalker.traverse(&node); // Walk that node and produce the XML... } catch(const XSLException& e) { - Exception::convert(pool, &method_name, e); + Exception::provide_source(pool, &method_name, e); } } @@ -481,7 +481,7 @@ static void _string(Request& r, const St // write out result r.write_no_lang(parserString); } catch(const XSLException& e) { - Exception::convert(pool, &method_name, e); + Exception::provide_source(pool, &method_name, e); } } @@ -511,16 +511,16 @@ static void _file(Request& r, const Stri Value *vcontent_type; if(charset) { VHash *vhcontent_type=new(pool) VHash(pool); - vhcontent_type->hash().put(*value_name, new(pool) VString(*scontent_type)); + vhcontent_type->hash(&method_name).put(*value_name, new(pool) VString(*scontent_type)); String *scharset=new(pool) String(pool, charset); - vhcontent_type->hash().put(*new(pool) String(pool, "charset"), new(pool) VString(*scharset)); + vhcontent_type->hash(&method_name).put(*new(pool) String(pool, "charset"), new(pool) VString(*scharset)); vcontent_type=vhcontent_type; } else vcontent_type=new(pool) VString(*scontent_type); vfile.set(false/*tainted*/, cstr, strlen(cstr), 0/*file_name*/, vcontent_type); r.write_no_lang(vfile); } catch(const XSLException& e) { - Exception::convert(pool, &method_name, e); + Exception::provide_source(pool, &method_name, e); } } @@ -533,26 +533,27 @@ static void _set(Request& r, const Strin Temp_lang temp_lang(r, String::UL_XML); const String& xml=r.process(vxml).as_string(); - std::istrstream stream(xml.cstr()); + std::istrstream stream( + xml.cstr(String::UL_UNSPECIFIED, r.connection)); const XalanParsedSource* parsedSource; try { parsedSource = new XalanDefaultParsedSource2(&stream); } catch (XSLException& e) { - Exception::convert(pool, &method_name, e); + Exception::provide_source(pool, &method_name, e); } catch (SAXParseException& e) { - Exception::convert(pool, &method_name, e); + Exception::provide_source(pool, &method_name, e); } catch (SAXException& e) { - Exception::convert(pool, &method_name, e); + Exception::provide_source(pool, &method_name, e); } catch (XMLException& e) { - Exception::convert(pool, &method_name, e); + Exception::provide_source(pool, &method_name, e); } catch(const XalanDOMException& e) { - Exception::convert(pool, &method_name, e); + Exception::provide_source(pool, &method_name, e); } // replace any previous parsed source @@ -592,36 +593,36 @@ static void _load(Request& r, const Stri parsedSource = new XalanDefaultParsedSource2(filespec); } catch (XSLException& e) { - Exception::convert(pool, &method_name, e); + Exception::provide_source(pool, &method_name, e); } catch (SAXParseException& e) { - Exception::convert(pool, &method_name, e); + Exception::provide_source(pool, &method_name, e); } catch (SAXException& e) { - Exception::convert(pool, &method_name, e); + Exception::provide_source(pool, &method_name, e); } catch (XMLException& e) { - Exception::convert(pool, &method_name, e); + Exception::provide_source(pool, &method_name, e); } catch(const XalanDOMException& e) { - Exception::convert(pool, &method_name, e); + Exception::provide_source(pool, &method_name, e); } // replace any previous parsed source 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); @@ -630,7 +631,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, @@ -638,107 +639,58 @@ static void _transform(Request& r, const "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); + 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( - parsed_source, - &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(); - Exception::convert(pool, &stylesheet_file_name, e); + Exception::provide_source(pool, &stylesheet_file_name, e); } catch (SAXParseException& e) { connection.close(); - Exception::convert(pool, &stylesheet_file_name, e); + Exception::provide_source(pool, &stylesheet_file_name, e); } catch (SAXException& e) { connection.close(); - Exception::convert(pool, &stylesheet_file_name, e); + Exception::provide_source(pool, &stylesheet_file_name, e); } catch (XMLException& e) { connection.close(); - Exception::convert(pool, &stylesheet_file_name, e); + Exception::provide_source(pool, &stylesheet_file_name, e); } catch(const XalanDOMException& e) { connection.close(); - Exception::convert(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); - - // 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"); + Exception::provide_source(pool, &stylesheet_file_name, e); } - // 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); - //_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( - &xalan_document, - &connection.stylesheet(true/*nocache*/), - target); - } - catch (XSLException& e) { - connection.close(); - Exception::convert(pool, &stylesheet_file_name, e); - } - catch (SAXParseException& e) { - connection.close(); - Exception::convert(pool, &stylesheet_file_name, e); - } - catch (SAXException& e) { - connection.close(); - Exception::convert(pool, &stylesheet_file_name, e); - } - catch (XMLException& e) { - connection.close(); - Exception::convert(pool, &stylesheet_file_name, e); - } - catch(const XalanDOMException& e) { - connection.close(); - Exception::convert(pool, &stylesheet_file_name, e); - } + // close + connection.close(); // write out result VXdoc& result=*new(pool) VXdoc(pool, target, false/*owns not*/); @@ -755,7 +707,7 @@ static void _getElementById(Request& r, if(XalanNode *node= vdoc.get_document(pool, &method_name).getElementById(*pool.transcode(elementId))) { // write out result - VXnode& result=*new(pool) VXnode(pool, node); + VXnode& result=*new(pool) VXnode(pool, node, false); r.write_no_lang(result); } } @@ -840,7 +792,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