--- parser3/src/classes/xnode.C 2002/01/11 12:24:27 1.22 +++ parser3/src/classes/xnode.C 2002/08/01 11:41:13 1.47 @@ -1,24 +1,26 @@ /** @file Parser: @b dom parser class. - Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://paf.design.ru) - - $Id: xnode.C,v 1.22 2002/01/11 12:24:27 paf Exp $ + Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexandr Petrosian (http://paf.design.ru) */ #include "classes.h" #ifdef XML +static const char* IDENT_XNODE_C="$Date: 2002/08/01 11:41:13 $"; + #include "pa_charset.h" #include "pa_request.h" #include "pa_vxnode.h" +#include "pa_vxdoc.h" +#include "pa_vvoid.h" #include "xnode.h" extern "C" { #include "gdomecore/gdome-xml-node.h" -}; #include "gdomecore/gdome-xml-document.h" +}; #include "gdome.h" #include "libxml/xpath.h" @@ -26,8 +28,8 @@ extern "C" { class xmlXPathObject_auto_ptr { public: - explicit xmlXPathObject_auto_ptr(xmlXPathObject *_P = 0) - : _Owns(_P != 0), _Ptr(_P) {} + explicit xmlXPathObject_auto_ptr(xmlXPathObject *_APtr = 0) + : _Owns(_APtr != 0), _Ptr(_APtr) {} xmlXPathObject_auto_ptr(const xmlXPathObject_auto_ptr& _Y) : _Owns(_Y._Owns), _Ptr(_Y.release()) {} xmlXPathObject_auto_ptr& operator=(const xmlXPathObject_auto_ptr& _Y) @@ -59,8 +61,8 @@ private: class xmlXPathContext_auto_ptr { public: - explicit xmlXPathContext_auto_ptr(xmlXPathContext *_P = 0) - : _Owns(_P != 0), _Ptr(_P) {} + explicit xmlXPathContext_auto_ptr(xmlXPathContext *_APtr = 0) + : _Owns(_APtr != 0), _Ptr(_APtr) {} xmlXPathContext_auto_ptr(const xmlXPathContext_auto_ptr& _Y) : _Owns(_Y._Owns), _Ptr(_Y.release()) {} xmlXPathContext_auto_ptr& operator=(const xmlXPathContext_auto_ptr& _Y) @@ -90,17 +92,14 @@ private: xmlXPathContext *_Ptr; }; -// defines - -#define XNODE_CLASS_NAME "xnode" - // helpers -GdomeNode *as_node(Pool& pool, const String& method_name, MethodParams *params, +GdomeNode *as_node(const String& method_name, MethodParams *params, int index, const char *msg) { Value& value=params->as_no_junction(index, msg); - if(strcmp(value.type(), VXNODE_TYPE)!=0) - throw Exception(0, 0, + if(!(strcmp(value.type(), VXNODE_TYPE)==0 + || strcmp(value.type(), VXDOC_TYPE)==0)) + throw Exception("parser.runtime", &method_name, msg); @@ -112,10 +111,10 @@ GdomeNode *as_node(Pool& pool, const Str GdomeAttr * as_attr(Pool& pool, const String& method_name, MethodParams *params, int index, const char *msg) { - GdomeNode *node=as_node(pool, method_name, params, index, msg); + GdomeNode *node=as_node(method_name, params, index, msg); GdomeException exc; if(gdome_n_nodeType(node, &exc)!=GDOME_ATTRIBUTE_NODE) - throw Exception(0, 0, + throw Exception("parser.runtime", &method_name, msg); @@ -131,8 +130,8 @@ static void _insertBefore(Request& r, co Pool& pool=r.pool(); VXnode& vnode=*static_cast(r.self); GdomeNode *selfNode=vnode.get_node(&method_name); - GdomeNode *newChild=as_node(pool, method_name, params, 0, "newChild must be node"); - GdomeNode *refChild=as_node(pool, method_name, params, 1, "refChild must be node"); + GdomeNode *newChild=as_node(method_name, params, 0, "newChild must be node"); + GdomeNode *refChild=as_node(method_name, params, 1, "refChild must be node"); GdomeException exc; if(GdomeNode *retNode=gdome_n_insertBefore(selfNode, newChild, refChild, &exc)) { @@ -140,7 +139,7 @@ static void _insertBefore(Request& r, co VXnode& result=*new(pool) VXnode(pool, retNode); r.write_no_lang(result); } else - throw Exception(0, 0, + throw Exception( &method_name, exc); } @@ -150,15 +149,15 @@ static void _replaceChild(Request& r, co Pool& pool=r.pool(); VXnode& vnode=*static_cast(r.self); GdomeNode *selfNode=vnode.get_node(&method_name); - GdomeNode *newChild=as_node(pool, method_name, params, 0, "newChild must be node"); - GdomeNode *refChild=as_node(pool, method_name, params, 1, "refChild must be node"); + GdomeNode *newChild=as_node(method_name, params, 0, "newChild must be node"); + GdomeNode *refChild=as_node(method_name, params, 1, "refChild must be node"); GdomeException exc; if(GdomeNode *retNode=gdome_n_replaceChild(selfNode, newChild, refChild, &exc)) { // write out result r.write_no_lang(*new(pool) VXnode(pool, retNode)); } else - throw Exception(0, 0, + throw Exception( &method_name, exc); } @@ -168,14 +167,14 @@ static void _removeChild(Request& r, con Pool& pool=r.pool(); VXnode& vnode=*static_cast(r.self); GdomeNode *selfNode=vnode.get_node(&method_name); - GdomeNode *oldChild=as_node(pool, method_name, params, 0, "oldChild must be node"); + GdomeNode *oldChild=as_node(method_name, params, 0, "oldChild must be node"); GdomeException exc; if(GdomeNode *retNode=gdome_n_removeChild(selfNode, oldChild, &exc)) { // write out result r.write_no_lang(*new(pool) VXnode(pool, retNode)); } else - throw Exception(0, 0, + throw Exception( &method_name, exc); } @@ -185,14 +184,14 @@ static void _appendChild(Request& r, con Pool& pool=r.pool(); VXnode& vnode=*static_cast(r.self); GdomeNode *selfNode=vnode.get_node(&method_name); - GdomeNode *newChild=as_node(pool, method_name, params, 0, "newChild must be node"); + GdomeNode *newChild=as_node(method_name, params, 0, "newChild must be node"); GdomeException exc; if(GdomeNode *retNode=gdome_n_appendChild(selfNode, newChild, &exc)) { // write out result r.write_no_lang(*new(pool) VXnode(pool, retNode)); } else - throw Exception(0, 0, + throw Exception( &method_name, exc); } @@ -205,13 +204,11 @@ static void _hasChildNodes(Request& r, c GdomeException exc; // write out result - VBool& result=*new(pool) VBool(pool, gdome_n_hasChildNodes(node, &exc)!=0); - result.set_name(method_name); - r.write_no_lang(result); + bool result=gdome_n_hasChildNodes(node, &exc)!=0; + r.write_no_lang(*new(pool) VBool(pool, result)); } // Node cloneNode(in boolean deep); -/// @test ownerDocument=? static void _cloneNode(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); VXnode& vnode=*static_cast(r.self); @@ -221,9 +218,7 @@ static void _cloneNode(Request& r, const GdomeException exc; // write out result - VXnode& result=*new(pool) VXnode(pool, gdome_n_cloneNode(node, deep, &exc)); - result.set_name(method_name); - r.write_no_lang(result); + r.write_no_lang(*new(pool) VXnode(pool, gdome_n_cloneNode(node, deep, &exc))); } // DOM1 element @@ -235,7 +230,7 @@ GdomeElement *get_self_element(Request& GdomeException exc; if(gdome_n_nodeType(node, &exc)!=GDOME_ELEMENT_NODE) - throw Exception(0, 0, + throw Exception("parser.runtime", &method_name, "method can be called on node of ELEMENT type"); @@ -252,7 +247,7 @@ static void _getAttribute(Request& r, co GdomeDOMString *attribute_value= gdome_el_getAttribute(element, pool.transcode(name).get(), &exc); // write out result - r.write_no_lang(*new(pool) VString(pool.transcode(attribute_value))); + r.write_no_lang(pool.transcode(attribute_value)); } // void setAttribute(in DOMString name, in DOMString value) raises(DOMException); @@ -268,7 +263,7 @@ static void _setAttribute(Request& r, co pool.transcode(attribute_value).get(), &exc); if(exc) - throw Exception(0, 0, + throw Exception( &method_name, exc); } @@ -282,7 +277,7 @@ static void _removeAttribute(Request& r, GdomeException exc; gdome_el_removeAttribute(element, pool.transcode(name).get(), &exc); if(exc) - throw Exception(0, 0, + throw Exception( &method_name, exc); } @@ -299,7 +294,7 @@ static void _getAttributeNode(Request& r VXnode& result=*new(pool) VXnode(pool, (GdomeNode *)attr); r.write_no_lang(result); } else if(exc) - throw Exception(0, 0, + throw Exception( &method_name, exc); } @@ -316,7 +311,7 @@ static void _setAttributeNode(Request& r VXnode& result=*new(pool) VXnode(pool, (GdomeNode *)returnAttr); r.write_no_lang(result); } else - throw Exception(0, 0, + throw Exception( &method_name, exc); } @@ -330,9 +325,9 @@ static void _removeAttributeNode(Request GdomeException exc; gdome_el_removeAttributeNode(element, oldAttr, &exc); if(exc) - throw Exception(0, 0, - &method_name, - exc); + throw Exception( + &method_name, + exc); } // NodeList getElementsByTagName(in DOMString name); @@ -358,50 +353,32 @@ static void _getElementsByTagName(Reques result.hash(0).put(skey, new(pool) VXnode(pool, gdome_nl_item(nodes, i, &exc))); } } else if(exc) - throw Exception(0, 0, - &method_name, - exc); + throw Exception( + &method_name, + exc); // write out result r.write_no_lang(result); } -// void normalize(); -static void _normalize(Request& r, const String& method_name, MethodParams *) { +static void _getElementsByTagNameNS(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - VXnode& vnode=*static_cast(r.self); - GdomeNode *selfNode=vnode.get_node(&method_name); - - GdomeException exc; - gdome_n_normalize(selfNode, &exc); - if(exc) - throw Exception(0, 0, - &method_name, - exc); -} -/* -static void _select(Request& r, const String& method_name, MethodParams *params) { -// _asm int 3; - Pool& pool=r.pool(); - VXnode& vnode=*static_cast(r.self); + GdomeElement *element=get_self_element(r, method_name); - // expression - const String& expression=params->as_string(0, "expression must be string"); - const char *expression_cstr=expression.cstr(); - XalanDOMString dstring(expression_cstr); - const XalanDOMChar *expression_dcstr=dstring.c_str(); - - XPathEvaluator evaluator; - // We'll use these to parse the XML file. - XalanSourceTreeDOMSupport dom_support; - - try { - NodeRefList list=evaluator.selectNodeList(dom_support, - &vnode.get_node(&method_name), - expression_dcstr); + // namespaceURI;localName + const String& namespaceURI=params->as_string(0, "namespaceURI must be string"); + const String& localName=params->as_string(1, "localName must be string"); - VHash& result=*new(pool) VHash(pool); - for(int i=0; i(r.self); + GdomeNode *selfNode=vnode.get_node(&method_name); + + GdomeException exc; + gdome_n_normalize(selfNode, &exc); + if(exc) + throw Exception( + &method_name, + exc); +} + +static void _selectX(Request& r, const String& method_name, MethodParams *params, + void (*handler)(Pool& pool, + const String& expression, + xmlXPathObject_auto_ptr res, + Value *& result)) { // _asm int 3; Pool& pool=r.pool(); VXnode& vnode=*static_cast(r.self); @@ -429,49 +423,194 @@ static void _selectSingle(Request& r, co GdomeException exc; GdomeNode *dome_node=vnode.get_node(&method_name); GdomeDocument *dome_document=gdome_n_ownerDocument(dome_node, &exc); - if(!dome_document) - dome_document=GDOME_DOC(dome_node); - xmlDoc *xml_document=((_Gdome_xml_Document *)dome_document)->n; + if(!dome_document) // document does not own itself, so ownerDocument = 0 + dome_document=GDOME_DOC(dome_node); // and we need downcast + xmlDoc *xml_document=gdome_xml_doc_get_xmlDoc(dome_document); xmlXPathContext_auto_ptr ctxt(xmlXPathNewContext(xml_document)); - ctxt->node=xmlDocGetRootElement(xml_document); + ctxt->node=gdome_xml_n_get_xmlNode(dome_node); /*error to stderr for now*/ xmlXPathObject_auto_ptr res( xmlXPathEvalExpression(BAD_CAST pool.transcode(expression)->str, ctxt.get())); + if(xmlHaveGenericErrors()) { + GdomeException exc=0; + throw Exception(&expression, exc); + } + + Value *result=0; if(res.get()) - switch(res->type) { - case XPATH_UNDEFINED: break; - case XPATH_NODESET: - { - if(res->nodesetval->nodeNr>1) - throw Exception(0, 0, - &expression, - "resulted not in a single node (%d)", res->nodesetval->nodeNr); - - VXnode& result=*new(pool) VXnode( - pool, - gdome_xml_n_mkref(res->nodesetval->nodeTab[0])); - result.set_name(method_name); - r.write_no_lang(result); - break; + handler(pool, expression, res, result); + if(result) + r.write_no_lang(*result); +} + +static void selectNodesHandler(Pool& pool, + const String& expression, + xmlXPathObject_auto_ptr res, + Value *& result) { + VHash *vhash=new(pool) VHash(pool); result=vhash; + switch(res->type) { + case XPATH_UNDEFINED: + break; + case XPATH_NODESET: + if(res->nodesetval) + if(int size=res->nodesetval->nodeNr) { + Hash& hash=vhash->hash(0); + for(int i=0; inodesetval->nodeTab[i]))); + } } - //case XPATH_BOOLEAN: nothing; break; - //case XPATH_NUMBER: nothing; break; - //case XPATH_STRING: nothing; break; - default: - throw Exception(0, 0, + break; + default: + throw Exception(0, + &expression, + "wrong xmlXPathEvalExpression result type (%d)", res->type); + break; // never + } +} + +static void selectNodeHandler(Pool& pool, + const String& expression, + xmlXPathObject_auto_ptr res, + Value *& result) { + switch(res->type) { + case XPATH_UNDEFINED: + break; + case XPATH_NODESET: + if(res->nodesetval && res->nodesetval->nodeNr) { // empty result strangly has NODESET res->type + if(res->nodesetval->nodeNr>1) + throw Exception("parser.runtime", &expression, - "unrecognized xmlXPathEvalExpression result type (%d)", res->type); - break; // never + "resulted not in a single node (%d)", res->nodesetval->nodeNr); + + result=new(pool) VXnode(pool, gdome_xml_n_mkref(res->nodesetval->nodeTab[0])); } + break; + case XPATH_BOOLEAN: + result=new(pool) VBool(pool, res->boolval!=0); + break; + case XPATH_NUMBER: + result=new(pool) VDouble(pool, res->floatval); + break; + case XPATH_STRING: + result=new(pool) VString( + pool.transcode( + GdomeDOMString_auto_ptr( + gdome_str_mkref_dup((const gchar *)res->stringval)).get())); + break; + default: + throw Exception("parser.runtime", + &expression, + "wrong xmlXPathEvalExpression result type (%d)", res->type); + break; // never + } +} + +static void selectBoolHandler(Pool& pool, + const String& expression, + xmlXPathObject_auto_ptr res, + Value *& result) { + switch(res->type) { + case XPATH_BOOLEAN: + result=new(pool) VBool(pool, res->boolval!=0); + break; + case XPATH_NODESET: + if(!(res->nodesetval && res->nodesetval->nodeNr)) + break; + // else[nodeset] fall down to default + default: + throw Exception("parser.runtime", + &expression, + "wrong xmlXPathEvalExpression result type (%d)", res->type); + break; // never + } +} + +static void selectNumberHandler(Pool& pool, + const String& expression, + xmlXPathObject_auto_ptr res, + Value *& result) { + switch(res->type) { + case XPATH_NUMBER: + result=new(pool) VDouble(pool, res->floatval); + break; + case XPATH_NODESET: + if(!(res->nodesetval && res->nodesetval->nodeNr)) + break; + // else[nodeset] fall down to default + default: + throw Exception("parser.runtime", + &expression, + "wrong xmlXPathEvalExpression result type (%d)", res->type); + break; // never + } +} + +static void selectStringHandler(Pool& pool, + const String& expression, + xmlXPathObject_auto_ptr res, + Value *& result) { + switch(res->type) { + case XPATH_UNDEFINED: + break; + case XPATH_STRING: + result=new(pool) VString( + pool.transcode( + GdomeDOMString_auto_ptr( + gdome_str_mkref_dup((const gchar *)res->stringval)).get())); + break; + case XPATH_NODESET: + if(!(res->nodesetval && res->nodesetval->nodeNr)) + break; + // else[nodeset] fall down to default + default: + throw Exception("parser.runtime", + &expression, + "wrong xmlXPathEvalExpression result type (%d)", res->type); + break; // never + } +} + +static void _select(Request& r, const String& method_name, MethodParams *params) { + _selectX(r, method_name, params, + selectNodesHandler); +} + +static void _selectSingle(Request& r, const String& method_name, MethodParams *params) { + _selectX(r, method_name, params, + selectNodeHandler); +} + +static void _selectBool(Request& r, const String& method_name, MethodParams *params) { + _selectX(r, method_name, params, + selectBoolHandler); +} + +static void _selectNumber(Request& r, const String& method_name, MethodParams *params) { + _selectX(r, method_name, params, + selectNumberHandler); +} + +static void _selectString(Request& r, const String& method_name, MethodParams *params) { + _selectX(r, method_name, params, + selectStringHandler); } // constructor -MXnode::MXnode(Pool& apool) : Methoded(apool), - consts(apool) { - set_name(*NEW String(pool(), XNODE_CLASS_NAME)); +MXnode::MXnode(Pool& apool, const char *aname, VStateless_class *abase) : + Methoded(apool, aname?aname:"xnode", abase), + consts(apool) +{ /// DOM1 node // Node insertBefore(in Node newChild,in Node refChild) raises(DOMException); @@ -503,15 +642,23 @@ MXnode::MXnode(Pool& apool) : Methoded(a add_native_method("removeAttributeNode", Method::CT_DYNAMIC, _removeAttributeNode, 1, 1); // NodeList getElementsByTagName(in DOMString name); add_native_method("getElementsByTagName", Method::CT_DYNAMIC, _getElementsByTagName, 1, 1); + // NodeList getElementsByTagNameNS(in DOMString namespaceURI, in DOMString localName); + add_native_method("getElementsByTagNameNS", Method::CT_DYNAMIC, _getElementsByTagNameNS, 2, 2); // void normalize(); add_native_method("normalize", Method::CT_DYNAMIC, _normalize, 0, 0); /// parser // ^node.select[/some/xpath/query] = hash $.#[dnode] -// add_native_method("select", Method::CT_DYNAMIC, _select, 1, 1); + add_native_method("select", Method::CT_DYNAMIC, _select, 1, 1); - // ^node.selectSingle[/some/xpath/query] = first dnode + // ^node.selectSingle[/some/xpath/query] = first node [if any] add_native_method("selectSingle", Method::CT_DYNAMIC, _selectSingle, 1, 1); + // ^node.selectBool[/some/xpath/query] = bool value [if any] + add_native_method("selectBool", Method::CT_DYNAMIC, _selectBool, 1, 1); + // ^node.selectNumber[/some/xpath/query] = double value [if any] + add_native_method("selectNumber", Method::CT_DYNAMIC, _selectNumber, 1, 1); + // ^node.selectString[/some/xpath/query] = strinv value [if any] + add_native_method("selectString", Method::CT_DYNAMIC, _selectString, 1, 1); // consts