--- parser3/src/classes/xdoc.C 2001/10/18 06:38:11 1.19 +++ parser3/src/classes/xdoc.C 2001/10/18 10:07:10 1.22 @@ -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.19 2001/10/18 06:38:11 parser Exp $ + $Id: xdoc.C,v 1.22 2001/10/18 10:07:10 parser Exp $ */ #include "classes.h" #ifdef XML @@ -38,6 +38,9 @@ #include #include #include +#include +#include +#include // defines @@ -73,7 +76,7 @@ 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 char *tagName=params->as_string(0, "tagName must be string").cstr(String::UL_XML); try { XalanNode *node= @@ -105,7 +108,7 @@ 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 char *data=params->as_string(0, "data must be string").cstr(String::UL_XML); XalanNode *node= vdoc.get_document(pool, &method_name). @@ -120,7 +123,7 @@ 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 char *data=params->as_string(0, "data must be string").cstr(String::UL_XML); XalanNode *node= vdoc.get_document(pool, &method_name). @@ -135,7 +138,7 @@ 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 char *data=params->as_string(0, "data must be string").cstr(String::UL_XML); try { XalanNode *node= @@ -154,8 +157,8 @@ 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 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); try { XalanNode *node= @@ -174,7 +177,7 @@ 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 char *name=params->as_string(0, "name must be string").cstr(String::UL_XML); try { XalanNode *node= @@ -192,7 +195,7 @@ 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 char *name=params->as_string(0, "name must be string").cstr(String::UL_XML); try { XalanNode *node= @@ -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] @@ -432,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 @@ -454,21 +457,27 @@ 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); ParserStringXalanOutputStream stream(parserString); - XalanOutputStreamPrintWriter writer(stream); - const char *content_type, *charset; - FormatterListener *formatterListener; - 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... + { // for writer flushing + XalanOutputStreamPrintWriter writer(stream); + const char *content_type, *charset; + FormatterListener *formatterListener; + 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... + } // write out result r.write_no_lang(parserString); @@ -551,42 +560,29 @@ static void _set(Request& r, const Strin vdoc.set_parsed_source(*parsedSource); } +/// @test free dom_document, xalan_document static void _create(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); VXdoc& vdoc=*static_cast(r.self); - Value& vqualifiedName=params->as_junction(0, "qualifiedName must be code"); - Temp_lang temp_lang(r, String::UL_XML); - const String& qualifiedName=r.process(vqualifiedName).as_string(); + DOM_Document *dom_document=new DOM_Document(); + *dom_document=DOM_Document::createDocument(); + /* + const String& squalifiedName=params->as_string(0, "qualifiedName must be string"); + /// +createXMLDecl ? String xml(pool, "\n"); - xml << "<" << qualifiedName << " />"; + xml << "<" << squalifiedName.cstr(String::UL_XML) << " />"; + */ - std::istrstream stream(xml.cstr()); + XalanDocument& xalan_document=*new XercesDocumentBridge( + *dom_document, + 0, + false /*threadSafe*/, + false /*don' buildBridge -- too early, empty document*/); - 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(xalan_document); } static void _load(Request& r, const String& method_name, MethodParams *params) { @@ -594,7 +590,7 @@ static void _load(Request& r, const Stri 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; @@ -637,7 +633,7 @@ static void _transform(Request& r, const // 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()); @@ -651,7 +647,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); @@ -698,7 +694,7 @@ 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 char *elementId=params->as_string(0, "elementID must be string").cstr(String::UL_XML); if(XalanNode *node= vdoc.get_document(pool, &method_name).getElementById(XalanDOMString(elementId))) {