--- parser3/src/classes/xdoc.C 2001/10/18 06:47:20 1.20 +++ parser3/src/classes/xdoc.C 2001/10/26 12:21:35 1.35 @@ -4,14 +4,15 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - $Id: xdoc.C,v 1.20 2001/10/18 06:47:20 parser Exp $ + $Id: xdoc.C,v 1.35 2001/10/26 12:21:35 paf Exp $ */ +#include "pa_types.h" #include "classes.h" #ifdef XML #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" @@ -38,6 +39,9 @@ #include #include #include +#include +#include +#include // defines @@ -56,7 +60,7 @@ class MXdoc : public MXnode { public: // VStateless_class - Value *create_new_value(Pool& pool) { return new(pool) VXdoc(pool); } + Value *create_new_value(Pool& pool) { return new(pool) VXdoc(pool, 0, false); } public: MXdoc(Pool& pool); @@ -73,22 +77,22 @@ static void _createElement(Request& r, c Pool& pool=r.pool(); VXdoc& vdoc=*static_cast(r.self); - const char *tagName=params->as_string(0, "tagName must be string").cstr(String::UL_XML); + const String& tagName=params->as_string(0, "tagName must be string"); try { XalanNode *node= vdoc.get_document(pool, &method_name). - createElement(XalanDOMString(tagName)); + 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) { - pool.exception()._throw(pool, &method_name, e); + Exception::provide_source(pool, &method_name, e); } } // DocumentFragment createDocumentFragment() -static void _createDocumentFragment(Request& r, const String& method_name, MethodParams *params) { +static void _createDocumentFragment(Request& r, const String& method_name, MethodParams *) { Pool& pool=r.pool(); VXdoc& vdoc=*static_cast(r.self); @@ -96,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); } @@ -105,13 +109,13 @@ static void _createTextNode(Request& r, Pool& pool=r.pool(); VXdoc& vdoc=*static_cast(r.self); - const char *data=params->as_string(0, "data must be string").cstr(String::UL_XML); + const String& data=params->as_string(0, "data must be string"); XalanNode *node= vdoc.get_document(pool, &method_name). - createTextNode(XalanDOMString(data)); + 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); } @@ -120,13 +124,13 @@ static void _createComment(Request& r, c Pool& pool=r.pool(); VXdoc& vdoc=*static_cast(r.self); - const char *data=params->as_string(0, "data must be string").cstr(String::UL_XML); + const String& data=params->as_string(0, "data must be string"); XalanNode *node= vdoc.get_document(pool, &method_name). - createComment(XalanDOMString(data)); + 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); } @@ -135,17 +139,17 @@ static void _createCDATASection(Request& Pool& pool=r.pool(); VXdoc& vdoc=*static_cast(r.self); - const char *data=params->as_string(0, "data must be string").cstr(String::UL_XML); + const String& data=params->as_string(0, "data must be string"); try { XalanNode *node= vdoc.get_document(pool, &method_name). - createCDATASection(XalanDOMString(data)); + 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) { - pool.exception()._throw(pool, &method_name, e); + Exception::provide_source(pool, &method_name, e); } } @@ -154,18 +158,18 @@ static void _createProcessingInstruction Pool& pool=r.pool(); VXdoc& vdoc=*static_cast(r.self); - const char *target=params->as_string(0, "target must be string").cstr(String::UL_XML); - const char *data=params->as_string(1, "data must be string").cstr(String::UL_XML); + const String& target=params->as_string(0, "data must be string"); + const String& data=params->as_string(1, "data must be string"); try { XalanNode *node= vdoc.get_document(pool, &method_name). - createProcessingInstruction(XalanDOMString(target), XalanDOMString(data)); + 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) { - pool.exception()._throw(pool, &method_name, e); + Exception::provide_source(pool, &method_name, e); } } @@ -174,17 +178,17 @@ static void _createAttribute(Request& r, Pool& pool=r.pool(); VXdoc& vdoc=*static_cast(r.self); - const char *name=params->as_string(0, "name must be string").cstr(String::UL_XML); + const String& name=params->as_string(0, "name must be string"); try { XalanNode *node= vdoc.get_document(pool, &method_name). - createAttribute(XalanDOMString(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) { - pool.exception()._throw(pool, &method_name, e); + Exception::provide_source(pool, &method_name, e); } } // EntityReference createEntityReference(in DOMString name) raises(DOMException); @@ -192,17 +196,17 @@ static void _createEntityReference(Reque Pool& pool=r.pool(); VXdoc& vdoc=*static_cast(r.self); - const char *name=params->as_string(0, "name must be string").cstr(String::UL_XML); + const String& name=params->as_string(0, "name must be string"); try { XalanNode *node= vdoc.get_document(pool, &method_name). - createEntityReference(XalanDOMString(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) { - pool.exception()._throw(pool, &method_name, e); + Exception::provide_source(pool, &method_name, e); } } @@ -377,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)))) @@ -417,7 +421,7 @@ static void create_optioned_listener( xalan_encoding // encoding ); } else - PTHROW(0, 0, + throw Exception(0, 0, method, XDOC_OUTPUT_METHOD_OPTION_NAME " option is invalid; valid methods are: " "'" XDOC_OUTPUT_METHOD_OPTION_VALUE_XML "', " @@ -448,16 +452,20 @@ static void _save(Request& r, const Stri FormatterTreeWalker treeWalker(*formatterListener); treeWalker.traverse(&node); // Walk that node and produce the XML... } catch(const XSLException& e) { - pool.exception()._throw(pool, &method_name, e); + Exception::provide_source(pool, &method_name, e); } } static void _string(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - VXnode& vnode=*static_cast(r.self); + VXdoc& vdoc=*static_cast(r.self); // node - XalanNode& node=vnode.get_node(pool, &method_name); + XalanNode *node=&vdoc.get_document(pool, &method_name);//.getDocumentElement(); + if(!node) + throw Exception(0, 0, + &method_name, + "no documentElement"); try { String parserString=*new(pool) String(pool); @@ -468,12 +476,12 @@ static void _string(Request& r, const St create_optioned_listener(content_type, charset, formatterListener, pool, method_name, params, 0, writer); FormatterTreeWalker treeWalker(*formatterListener); - treeWalker.traverse(&node); // Walk that node and produce the XML... + treeWalker.traverse(node); // Walk that node and produce the XML... // write out result r.write_no_lang(parserString); } catch(const XSLException& e) { - pool.exception()._throw(pool, &method_name, e); + Exception::provide_source(pool, &method_name, e); } } @@ -512,7 +520,7 @@ static void _file(Request& r, const Stri vfile.set(false/*tainted*/, cstr, strlen(cstr), 0/*file_name*/, vcontent_type); r.write_no_lang(vfile); } catch(const XSLException& e) { - pool.exception()._throw(pool, &method_name, e); + Exception::provide_source(pool, &method_name, e); } } @@ -532,19 +540,19 @@ static void _set(Request& r, const Strin parsedSource = new XalanDefaultParsedSource2(&stream); } catch (XSLException& e) { - pool.exception()._throw(pool, &method_name, e); + Exception::provide_source(pool, &method_name, e); } catch (SAXParseException& e) { - pool.exception()._throw(pool, &method_name, e); + Exception::provide_source(pool, &method_name, e); } catch (SAXException& e) { - pool.exception()._throw(pool, &method_name, e); + Exception::provide_source(pool, &method_name, e); } catch (XMLException& e) { - pool.exception()._throw(pool, &method_name, e); + Exception::provide_source(pool, &method_name, e); } catch(const XalanDOMException& e) { - pool.exception()._throw(pool, &method_name, e); + Exception::provide_source(pool, &method_name, e); } // replace any previous parsed source @@ -552,39 +560,23 @@ static void _set(Request& r, const Strin } static void _create(Request& r, const String& method_name, MethodParams *params) { + //_asm int 3; Pool& pool=r.pool(); VXdoc& vdoc=*static_cast(r.self); - const String& squalifiedName=params->as_string(0, "qualifiedName must be string"); + const String& qualifiedName=params->as_string(0, "qualifiedName must be string"); - String xml(pool, "\n"); - xml << "<" << squalifiedName.cstr(String::UL_XML) << " />"; + XalanDocument& document=*new XercesDocumentBridge( + DOM_Document::createDocument(), + 0, + false /*threadSafe*/, + false /*don' buildBridge -- too early, empty document*/); - std::istrstream stream(xml.cstr()); + /// +createXMLDecl ? + document.appendChild(document.createElement(*pool.transcode(qualifiedName))); - const XalanParsedSource* parsedSource; - - try { - parsedSource = new XalanDefaultParsedSource2(&stream); - } - catch (XSLException& e) { - pool.exception()._throw(pool, &method_name, e); - } - catch (SAXParseException& e) { - pool.exception()._throw(pool, &method_name, e); - } - catch (SAXException& e) { - pool.exception()._throw(pool, &method_name, e); - } - catch (XMLException& e) { - pool.exception()._throw(pool, &method_name, e); - } - catch(const XalanDOMException& e) { - pool.exception()._throw(pool, &method_name, e); - } - - // replace any previous parsed source - vdoc.set_parsed_source(*parsedSource); + // replace any previous document + vdoc.set_document(document, true/*owns*/); } static void _load(Request& r, const String& method_name, MethodParams *params) { @@ -600,19 +592,19 @@ static void _load(Request& r, const Stri parsedSource = new XalanDefaultParsedSource2(filespec); } catch (XSLException& e) { - pool.exception()._throw(pool, &method_name, e); + Exception::provide_source(pool, &method_name, e); } catch (SAXParseException& e) { - pool.exception()._throw(pool, &method_name, e); + Exception::provide_source(pool, &method_name, e); } catch (SAXException& e) { - pool.exception()._throw(pool, &method_name, e); + Exception::provide_source(pool, &method_name, e); } catch (XMLException& e) { - pool.exception()._throw(pool, &method_name, e); + Exception::provide_source(pool, &method_name, e); } catch(const XalanDOMException& e) { - pool.exception()._throw(pool, &method_name, e); + Exception::provide_source(pool, &method_name, e); } // replace any previous parsed source @@ -629,6 +621,7 @@ static void add_xslt_param(const Hash::K 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); @@ -637,57 +630,61 @@ 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 - PTHROW(0, 0, + 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); + 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); + 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(); - pool.exception()._throw(pool, &stylesheet_file_name, e); + Exception::provide_source(pool, &stylesheet_file_name, e); } catch (SAXParseException& e) { connection.close(); - pool.exception()._throw(pool, &stylesheet_file_name, e); + Exception::provide_source(pool, &stylesheet_file_name, e); } catch (SAXException& e) { connection.close(); - pool.exception()._throw(pool, &stylesheet_file_name, e); + Exception::provide_source(pool, &stylesheet_file_name, e); } catch (XMLException& e) { connection.close(); - pool.exception()._throw(pool, &stylesheet_file_name, e); + Exception::provide_source(pool, &stylesheet_file_name, e); } catch(const XalanDOMException& e) { connection.close(); - pool.exception()._throw(pool, &stylesheet_file_name, e); + Exception::provide_source(pool, &stylesheet_file_name, e); } // write out result - VXdoc& result=*new(pool) VXdoc(pool); - result.set_document(*target); + VXdoc& result=*new(pool) VXdoc(pool, target, false/*owns not*/); r.write_no_lang(result); } @@ -696,12 +693,12 @@ static void _getElementById(Request& r, VXdoc& vdoc=*static_cast(r.self); // elementId - const char *elementId=params->as_string(0, "elementID must be string").cstr(String::UL_XML); + const String& elementId=params->as_string(0, "elementID must be string"); if(XalanNode *node= - vdoc.get_document(pool, &method_name).getElementById(XalanDOMString(elementId))) { + 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); } } @@ -786,7 +783,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