--- parser3/src/classes/xdoc.C 2001/10/15 11:48:04 1.16 +++ parser3/src/classes/xdoc.C 2001/10/18 06:47:20 1.20 @@ -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.20 2001/10/18 06:47:20 parser Exp $ */ #include "classes.h" #ifdef XML @@ -73,7 +73,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 +105,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 +120,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 +135,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 +154,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 +174,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 +192,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 +212,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 +238,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 +375,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 +388,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 +432,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 @@ -554,12 +551,48 @@ 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& squalifiedName=params->as_string(0, "qualifiedName must be string"); + + String xml(pool, "\n"); + xml << "<" << squalifiedName.cstr(String::UL_XML) << " />"; + + std::istrstream stream(xml.cstr()); + + 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); +} + 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; @@ -602,7 +635,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()); @@ -616,7 +649,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); @@ -663,7 +696,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))) { @@ -727,6 +760,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);