--- parser3/src/classes/xnode.C 2002/01/14 15:29:41 1.26 +++ parser3/src/classes/xnode.C 2002/09/18 08:52:50 1.52 @@ -1,25 +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.26 2002/01/14 15:29:41 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/09/18 08:52:50 $"; + #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" @@ -27,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) @@ -60,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) @@ -91,32 +92,27 @@ 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(Value *vxnode=value.as(VXNODE_TYPE, false)) + return static_cast(vxnode)->get_node(&method_name); + else + throw Exception("parser.runtime", &method_name, msg); - - VXnode& vnode=*static_cast(&value); - return vnode.get_node(&method_name); } // helpers 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); @@ -130,10 +126,10 @@ GdomeAttr * as_attr(Pool& pool, const St // Node insertBefore(in Node newChild,in Node refChild) raises(DOMException); static void _insertBefore(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - VXnode& vnode=*static_cast(r.self); + VXnode& vnode=*static_cast(r.get_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)) { @@ -141,7 +137,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); } @@ -149,17 +145,17 @@ static void _insertBefore(Request& r, co // Node replaceChild(in Node newChild,in Node oldChild) raises(DOMException); static void _replaceChild(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - VXnode& vnode=*static_cast(r.self); + VXnode& vnode=*static_cast(r.get_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); } @@ -167,16 +163,16 @@ static void _replaceChild(Request& r, co // Node removeChild(in Node oldChild) raises(DOMException); static void _removeChild(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - VXnode& vnode=*static_cast(r.self); + VXnode& vnode=*static_cast(r.get_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); } @@ -184,16 +180,16 @@ static void _removeChild(Request& r, con // Node appendChild(in Node newChild) raises(DOMException); static void _appendChild(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - VXnode& vnode=*static_cast(r.self); + VXnode& vnode=*static_cast(r.get_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); } @@ -201,44 +197,40 @@ static void _appendChild(Request& r, con // boolean hasChildNodes(); static void _hasChildNodes(Request& r, const String& method_name, MethodParams *) { Pool& pool=r.pool(); - VXnode& vnode=*static_cast(r.self); + VXnode& vnode=*static_cast(r.get_self()); GdomeNode *node=vnode.get_node(&method_name); 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); + VXnode& vnode=*static_cast(r.get_self()); GdomeNode *node=vnode.get_node(&method_name); bool deep=params->as_bool(0, "deep must be bool", r); 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 GdomeElement *get_self_element(Request& r, const String& method_name) { Pool& pool=r.pool(); - VXnode& vnode=*static_cast(r.self); + VXnode& vnode=*static_cast(r.get_self()); GdomeNode *node=vnode.get_node(&method_name); 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"); + "method can only be called on nodes of ELEMENT type"); return GDOME_EL(node); } @@ -253,7 +245,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); @@ -269,7 +261,7 @@ static void _setAttribute(Request& r, co pool.transcode(attribute_value).get(), &exc); if(exc) - throw Exception(0, 0, + throw Exception( &method_name, exc); } @@ -283,7 +275,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); } @@ -300,7 +292,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); } @@ -317,7 +309,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); } @@ -331,7 +323,7 @@ static void _removeAttributeNode(Request GdomeException exc; gdome_el_removeAttributeNode(element, oldAttr, &exc); if(exc) - throw Exception(0, 0, + throw Exception( &method_name, exc); } @@ -359,7 +351,7 @@ 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, + throw Exception( &method_name, exc); @@ -367,16 +359,49 @@ static void _getElementsByTagName(Reques r.write_no_lang(result); } +static void _getElementsByTagNameNS(Request& r, const String& method_name, MethodParams *params) { + Pool& pool=r.pool(); + GdomeElement *element=get_self_element(r, method_name); + + // namespaceURI;localName + const String& namespaceURI=params->as_string(0, "namespaceURI must be string"); + const String& localName=params->as_string(1, "localName must be string"); + + GdomeException exc; + VHash& result=*new(pool) VHash(pool); + if(GdomeNodeList *nodes= + gdome_el_getElementsByTagNameNS( + element, + pool.transcode(namespaceURI).get(), + pool.transcode(localName).get(), + &exc)) { + gulong length=gdome_nl_length(nodes, &exc); + for(gulong i=0; i(r.self); + VXnode& vnode=*static_cast(r.get_self()); GdomeNode *selfNode=vnode.get_node(&method_name); GdomeException exc; gdome_n_normalize(selfNode, &exc); if(exc) - throw Exception(0, 0, + throw Exception( &method_name, exc); } @@ -388,7 +413,7 @@ static void _selectX(Request& r, const S Value *& result)) { // _asm int 3; Pool& pool=r.pool(); - VXnode& vnode=*static_cast(r.self); + VXnode& vnode=*static_cast(r.get_self()); // expression const String& expression=params->as_string(0, "expression must be string"); @@ -396,51 +421,54 @@ static void _selectX(Request& r, const S 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()) handler(pool, expression, res, result); - if(result) { - result->set_name(method_name); + 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(int size=res->nodesetval->nodeNr) { - VHash *vhash=new(pool) VHash(pool); - Hash& hash=vhash->hash(0); - for(int i=0; inodesetval) + if(int size=res->nodesetval->nodeNr) { + Hash& hash=vhash->hash(0); + for(int i=0; inodesetval->nodeTab[0]))); + hash.put(skey, new(pool) VXnode(pool, + gdome_xml_n_mkref(res->nodesetval->nodeTab[i]))); + } } - result=vhash; - } break; default: - throw Exception(0, 0, + throw Exception(0, &expression, "wrong xmlXPathEvalExpression result type (%d)", res->type); break; // never @@ -455,9 +483,9 @@ static void selectNodeHandler(Pool& pool case XPATH_UNDEFINED: break; case XPATH_NODESET: - if(res->nodesetval->nodeNr) { // empty result strangly has NODESET res->type + if(res->nodesetval && res->nodesetval->nodeNr) { // empty result strangly has NODESET res->type if(res->nodesetval->nodeNr>1) - throw Exception(0, 0, + throw Exception("parser.runtime", &expression, "resulted not in a single node (%d)", res->nodesetval->nodeNr); @@ -477,7 +505,7 @@ static void selectNodeHandler(Pool& pool gdome_str_mkref_dup((const gchar *)res->stringval)).get())); break; default: - throw Exception(0, 0, + throw Exception("parser.runtime", &expression, "wrong xmlXPathEvalExpression result type (%d)", res->type); break; // never @@ -493,11 +521,11 @@ static void selectBoolHandler(Pool& pool result=new(pool) VBool(pool, res->boolval!=0); break; case XPATH_NODESET: - if(!res->nodesetval->nodeNr) + if(!(res->nodesetval && res->nodesetval->nodeNr)) break; // else[nodeset] fall down to default default: - throw Exception(0, 0, + throw Exception("parser.runtime", &expression, "wrong xmlXPathEvalExpression result type (%d)", res->type); break; // never @@ -513,11 +541,11 @@ static void selectNumberHandler(Pool& po result=new(pool) VDouble(pool, res->floatval); break; case XPATH_NODESET: - if(!res->nodesetval->nodeNr) + if(!(res->nodesetval && res->nodesetval->nodeNr)) break; // else[nodeset] fall down to default default: - throw Exception(0, 0, + throw Exception("parser.runtime", &expression, "wrong xmlXPathEvalExpression result type (%d)", res->type); break; // never @@ -538,11 +566,11 @@ static void selectStringHandler(Pool& po gdome_str_mkref_dup((const gchar *)res->stringval)).get())); break; case XPATH_NODESET: - if(!res->nodesetval->nodeNr) + if(!(res->nodesetval && res->nodesetval->nodeNr)) break; // else[nodeset] fall down to default default: - throw Exception(0, 0, + throw Exception("parser.runtime", &expression, "wrong xmlXPathEvalExpression result type (%d)", res->type); break; // never @@ -576,10 +604,11 @@ static void _selectString(Request& r, co // 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); @@ -611,6 +640,8 @@ 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);