--- parser3/src/classes/xdoc.C 2001/10/15 11:48:04 1.16 +++ parser3/src/classes/xdoc.C 2001/10/18 13:09:37 1.26 @@ -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.16 2001/10/15 11:48:04 parser Exp $ + $Id: xdoc.C,v 1.26 2001/10/18 13:09:37 parser Exp $ */ #include "classes.h" #ifdef XML @@ -38,6 +38,9 @@ #include #include #include +#include +#include +#include // defines @@ -73,12 +76,12 @@ 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 not be code").cstr(String::UL_AS_IS); + 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); r.write_no_lang(result); @@ -88,7 +91,7 @@ static void _createElement(Request& r, c } // 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); @@ -105,11 +108,11 @@ static void _createTextNode(Request& r, Pool& pool=r.pool(); VXdoc& vdoc=*static_cast(r.self); - const char *data=params->as_string(0, "data must not be code").cstr(String::UL_AS_IS); + 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); r.write_no_lang(result); @@ -120,11 +123,11 @@ 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 not be code").cstr(String::UL_AS_IS); + 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); r.write_no_lang(result); @@ -135,12 +138,12 @@ static void _createCDATASection(Request& Pool& pool=r.pool(); VXdoc& vdoc=*static_cast(r.self); - const char *data=params->as_string(0, "data must not be code").cstr(String::UL_AS_IS); + 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); r.write_no_lang(result); @@ -154,13 +157,13 @@ static void _createProcessingInstruction Pool& pool=r.pool(); VXdoc& vdoc=*static_cast(r.self); - const char *target=params->as_string(0, "target must not be code").cstr(String::UL_AS_IS); - const char *data=params->as_string(1, "data must not be code").cstr(String::UL_AS_IS); + 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); r.write_no_lang(result); @@ -174,12 +177,12 @@ static void _createAttribute(Request& r, Pool& pool=r.pool(); VXdoc& vdoc=*static_cast(r.self); - const char *name=params->as_string(0, "name must not be code").cstr(String::UL_AS_IS); + 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); r.write_no_lang(result); @@ -192,12 +195,12 @@ static void _createEntityReference(Reque Pool& pool=r.pool(); VXdoc& vdoc=*static_cast(r.self); - const char *name=params->as_string(0, "name must not be code").cstr(String::UL_AS_IS); + 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); r.write_no_lang(result); @@ -212,7 +215,7 @@ static void _getElementsByTagName(Reques VXdoc& vdoc=*static_cast(r.self); // tagname - const char *name=params->as_string(0, "name must not be code").cstr(String::UL_AS_IS); + const char *name=params->as_string(0, "name must be string").cstr(String::UL_XML); VHash& result=*new(pool) VHash(pool); if(const XalanNodeList *nodes= @@ -238,8 +241,8 @@ static void _getElementsByTagNameNS(Requ VXdoc& vdoc=*static_cast(r.self); // namespaceURI;localName - const char *namespaceURI=params->as_string(0, "namespaceURI must not be code").cstr(String::UL_AS_IS); - const char *localName=params->as_string(0, "localName must not be code").cstr(String::UL_AS_IS); + const char *namespaceURI=params->as_string(0, "namespaceURI must be string").cstr(String::UL_XML); + const char *localName=params->as_string(0, "localName must be string").cstr(String::UL_XML); VHash& result=*new(pool) VHash(pool); if(const XalanNodeList *nodes= @@ -375,7 +378,7 @@ static void create_optioned_listener( XalanDOMString xalan_encoding; if(params->size()>index) { - Value& voptions=params->as_no_junction(index, "options must not be code"); + Value& voptions=params->as_no_junction(index, "options must be string"); if(voptions.is_defined()) { if(Hash *options=voptions.get_hash()) { // $.method[xml|html|text] @@ -388,10 +391,7 @@ static void create_optioned_listener( String(pool, XDOC_OUTPUT_ENCODING_OPTION_NAME)))) { scharset=&vencoding->as_string(); } - } else - PTHROW(0, 0, - &method_name, - "options must be hash"); + } } } @@ -435,7 +435,7 @@ static void _save(Request& r, const Stri VXnode& vnode=*static_cast(r.self); // filespec - const String& file_name=params->as_string(0, "file name must not be code"); + const String& file_name=params->as_string(0, "file name must be string"); const char *filespec=r.absolute(file_name).cstr(String::UL_FILE_SPEC); // node @@ -457,10 +457,14 @@ static void _save(Request& r, const Stri 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) + PTHROW(0, 0, + &method_name, + "no documentElement"); try { String parserString=*new(pool) String(pool); @@ -471,7 +475,7 @@ 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); @@ -554,12 +558,31 @@ static void _set(Request& r, const Strin vdoc.set_parsed_source(*parsedSource); } +static void _create(Request& r, const String& method_name, MethodParams *params) { + Pool& pool=r.pool(); + VXdoc& vdoc=*static_cast(r.self); + + const String& qualifiedName=params->as_string(0, "qualifiedName must be string"); + + XalanDocument& document=*new XercesDocumentBridge( + DOM_Document::createDocument(), + 0, + false /*threadSafe*/, + false /*don' buildBridge -- too early, empty document*/); + + /// +createXMLDecl ? + document.appendChild(document.createElement(pool.transcode(qualifiedName))); + + // replace any previous document + vdoc.set_document(document); +} + static void _load(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); VXdoc& vdoc=*static_cast(r.self); // filespec - const String& file_name=params->as_string(0, "file name must not be code"); + const String& file_name=params->as_string(0, "file name must be string"); const char *filespec=r.absolute(file_name).cstr(String::UL_FILE_SPEC); const XalanParsedSource* parsedSource; @@ -596,13 +619,14 @@ 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); // params if(params->size()>1) { - Value& vparams=params->as_no_junction(1, "transform parameters parameter must not be code"); + 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()); @@ -616,7 +640,7 @@ static void _transform(Request& r, const const XalanParsedSource &parsed_source=vdoc.get_parsed_source(pool, &method_name); // stylesheet - const String& stylesheet_file_name=params->as_string(0, "file name must not be code"); + 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); @@ -628,6 +652,68 @@ static void _transform(Request& r, const try { vdoc.transformer().transform2( parsed_source, + &connection.stylesheet(true/*nocache* /), + target); + } + catch (XSLException& e) { + connection.close(); + pool.exception()._throw(pool, &stylesheet_file_name, e); + } + catch (SAXParseException& e) { + connection.close(); + pool.exception()._throw(pool, &stylesheet_file_name, e); + } + catch (SAXException& e) { + connection.close(); + pool.exception()._throw(pool, &stylesheet_file_name, e); + } + catch (XMLException& e) { + connection.close(); + pool.exception()._throw(pool, &stylesheet_file_name, e); + } + catch(const XalanDOMException& e) { + connection.close(); + pool.exception()._throw(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 + PTHROW(0, 0, + &method_name, + "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); + //_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); } @@ -663,10 +749,10 @@ static void _getElementById(Request& r, VXdoc& vdoc=*static_cast(r.self); // elementId - const char *elementId=params->as_string(0, "elementID must not be code").cstr(String::UL_AS_IS); + 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); r.write_no_lang(result); @@ -727,6 +813,8 @@ MXdoc::MXdoc(Pool& apool) : MXnode(apool // ^xdoc::set[xml] add_native_method("set", Method::CT_DYNAMIC, _set, 1, 1); + // ^xdoc::create{qualifiedName} + add_native_method("create", Method::CT_DYNAMIC, _create, 1, 1); // ^xdoc::load[some.xml] add_native_method("load", Method::CT_DYNAMIC, _load, 1, 1);