--- parser3/src/classes/xnode.C 2002/01/21 13:04:02 1.28 +++ parser3/src/classes/xnode.C 2003/03/06 16:15:25 1.54.2.9 @@ -1,17 +1,20 @@ /** @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.28 2002/01/21 13:04:02 paf Exp $ + Copyright (c) 2001-2003 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: 2003/03/06 16:15:25 $"; + +#include "pa_vmethod_frame.h" + #include "pa_charset.h" #include "pa_request.h" #include "pa_vxnode.h" +#include "pa_vxdoc.h" #include "pa_vvoid.h" #include "xnode.h" @@ -23,12 +26,16 @@ extern "C" { #include "gdome.h" #include "libxml/xpath.h" +// global variable + +DECLARE_CLASS_VAR(xnode, new MXnode, 0); + // classes 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 +67,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,33 +98,28 @@ private: xmlXPathContext *_Ptr; }; -// defines - -#define XNODE_CLASS_NAME "xnode" - // helpers -GdomeNode *as_node(Pool& pool, 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, - &method_name, +GdomeNode *as_node(StringPtr method_name, MethodParams* params, + int index, const char* msg) { + ValuePtr value=params->as_no_junction(index, msg); + 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); +GdomeAttr * as_attr(Pool& pool, StringPtr method_name, MethodParams* params, + int index, const char* 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, - &method_name, + throw Exception("parser.runtime", + method_name, msg); return GDOME_A(node); @@ -128,185 +130,181 @@ GdomeAttr * as_attr(Pool& pool, const St // DOM1 node // Node insertBefore(in Node newChild,in Node refChild) raises(DOMException); -static void _insertBefore(Request& r, const String& method_name, MethodParams *params) { +static void _insertBefore(Request& r, StringPtr method_name, MethodParams* params) { 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"); + VXnode& vnode=GET_SELF(r, VXnode); + GdomeNode *selfNode=vnode.get_node(method_name); + 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)) { // write out result - VXnode& result=*new(pool) VXnode(pool, retNode); - r.write_no_lang(result); + r.write_no_lang(ValuePtr(new VXnode(&pool, retNode))); } else - throw Exception(0, 0, - &method_name, + throw Exception( + method_name, exc); } // Node replaceChild(in Node newChild,in Node oldChild) raises(DOMException); -static void _replaceChild(Request& r, const String& method_name, MethodParams *params) { +static void _replaceChild(Request& r, StringPtr method_name, MethodParams* params) { 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"); + VXnode& vnode=GET_SELF(r, VXnode); + GdomeNode *selfNode=vnode.get_node(method_name); + 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)); + r.write_no_lang(ValuePtr(new VXnode(&pool, retNode))); } else - throw Exception(0, 0, - &method_name, + throw Exception( + method_name, exc); } // Node removeChild(in Node oldChild) raises(DOMException); -static void _removeChild(Request& r, const String& method_name, MethodParams *params) { +static void _removeChild(Request& r, StringPtr method_name, MethodParams* params) { 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"); + VXnode& vnode=GET_SELF(r, VXnode); + GdomeNode *selfNode=vnode.get_node(method_name); + 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)); + r.write_no_lang(ValuePtr(new VXnode(&pool, retNode))); } else - throw Exception(0, 0, - &method_name, + throw Exception( + method_name, exc); } // Node appendChild(in Node newChild) raises(DOMException); -static void _appendChild(Request& r, const String& method_name, MethodParams *params) { +static void _appendChild(Request& r, StringPtr method_name, MethodParams* params) { 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"); + VXnode& vnode=GET_SELF(r, VXnode); + GdomeNode *selfNode=vnode.get_node(method_name); + 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)); + r.write_no_lang(ValuePtr(new VXnode(&pool, retNode))); } else - throw Exception(0, 0, - &method_name, + throw Exception( + method_name, exc); } // boolean hasChildNodes(); -static void _hasChildNodes(Request& r, const String& method_name, MethodParams *) { +static void _hasChildNodes(Request& r, StringPtr method_name, MethodParams* ) { Pool& pool=r.pool(); - VXnode& vnode=*static_cast(r.self); - GdomeNode *node=vnode.get_node(&method_name); + VXnode& vnode=GET_SELF(r, VXnode); + 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(ValuePtr(new VBool(result))); } // Node cloneNode(in boolean deep); -/// @test ownerDocument=? -static void _cloneNode(Request& r, const String& method_name, MethodParams *params) { +static void _cloneNode(Request& r, StringPtr method_name, MethodParams* params) { Pool& pool=r.pool(); - VXnode& vnode=*static_cast(r.self); - GdomeNode *node=vnode.get_node(&method_name); + VXnode& vnode=GET_SELF(r, VXnode); + 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(ValuePtr(new VXnode(&pool, gdome_n_cloneNode(node, deep, &exc)))); } // DOM1 element -GdomeElement *get_self_element(Request& r, const String& method_name) { +GdomeElement *get_self_element(Request& r, StringPtr method_name) { Pool& pool=r.pool(); - VXnode& vnode=*static_cast(r.self); - GdomeNode *node=vnode.get_node(&method_name); + VXnode& vnode=GET_SELF(r, VXnode); + GdomeNode *node=vnode.get_node(method_name); GdomeException exc; if(gdome_n_nodeType(node, &exc)!=GDOME_ELEMENT_NODE) - throw Exception(0, 0, - &method_name, - "method can be called on node of ELEMENT type"); + throw Exception("parser.runtime", + method_name, + "method can only be called on nodes of ELEMENT type"); return GDOME_EL(node); } + + // DOMString getAttribute(in DOMString name); -static void _getAttribute(Request& r, const String& method_name, MethodParams *params) { +static void _getAttribute(Request& r, StringPtr method_name, MethodParams* params) { Pool& pool=r.pool(); GdomeElement *element=get_self_element(r, method_name); - const String& name=params->as_string(0, "name must be string"); + StringPtr name=params->as_string(0, "name must be string"); GdomeException exc; GdomeDOMString *attribute_value= - gdome_el_getAttribute(element, pool.transcode(name).get(), &exc); + gdome_el_getAttribute(element, r.transcode(name).get(), &exc); // write out result - r.write_no_lang(*new(pool) VString(pool.transcode(attribute_value))); + r.write_no_lang(*r.transcode(attribute_value, name)); } // void setAttribute(in DOMString name, in DOMString value) raises(DOMException); -static void _setAttribute(Request& r, const String& method_name, MethodParams *params) { +static void _setAttribute(Request& r, StringPtr method_name, MethodParams* params) { Pool& pool=r.pool(); GdomeElement *element=get_self_element(r, method_name); - const String& name=params->as_string(0, "name must be string"); - const String& attribute_value=params->as_string(1, "value must be string"); + StringPtr name=params->as_string(0, "name must be string"); + StringPtr attribute_value=params->as_string(1, "value must be string"); GdomeException exc; gdome_el_setAttribute(element, - pool.transcode(name).get(), - pool.transcode(attribute_value).get(), + r.transcode(name).get(), + r.transcode(attribute_value).get(), &exc); if(exc) - throw Exception(0, 0, - &method_name, + throw Exception( + method_name, exc); } // void removeAttribute(in DOMString name) raises(DOMException); -static void _removeAttribute(Request& r, const String& method_name, MethodParams *params) { +static void _removeAttribute(Request& r, StringPtr method_name, MethodParams* params) { Pool& pool=r.pool(); GdomeElement *element=get_self_element(r, method_name); - const String& name=params->as_string(0, "name must be string"); + StringPtr name=params->as_string(0, "name must be string"); GdomeException exc; - gdome_el_removeAttribute(element, pool.transcode(name).get(), &exc); + gdome_el_removeAttribute(element, r.transcode(name).get(), &exc); if(exc) - throw Exception(0, 0, - &method_name, + throw Exception( + method_name, exc); } // Attr getAttributeNode(in DOMString name); -static void _getAttributeNode(Request& r, const String& method_name, MethodParams *params) { +static void _getAttributeNode(Request& r, StringPtr method_name, MethodParams* params) { Pool& pool=r.pool(); GdomeElement *element=get_self_element(r, method_name); - const String& name=params->as_string(0, "name must be string"); + StringPtr name=params->as_string(0, "name must be string"); GdomeException exc; - if(GdomeAttr *attr=gdome_el_getAttributeNode(element, pool.transcode(name).get(), &exc)) { + if(GdomeAttr *attr=gdome_el_getAttributeNode(element, r.transcode(name).get(), &exc)) { // write out result - VXnode& result=*new(pool) VXnode(pool, (GdomeNode *)attr); - r.write_no_lang(result); + r.write_no_lang(ValuePtr(new VXnode(&pool, (GdomeNode *)attr))); } else if(exc) - throw Exception(0, 0, - &method_name, + throw Exception( + method_name, exc); } // Attr setAttributeNode(in Attr newAttr) raises(DOMException); -static void _setAttributeNode(Request& r, const String& method_name, MethodParams *params) { +static void _setAttributeNode(Request& r, StringPtr method_name, MethodParams* params) { Pool& pool=r.pool(); GdomeElement *element=get_self_element(r, method_name); GdomeAttr * newAttr=as_attr(pool, method_name, params, 0, "newAttr must be ATTRIBUTE node"); @@ -314,16 +312,15 @@ static void _setAttributeNode(Request& r GdomeException exc; if(GdomeAttr *returnAttr=gdome_el_setAttributeNode(element, newAttr, &exc)) { // write out result - VXnode& result=*new(pool) VXnode(pool, (GdomeNode *)returnAttr); - r.write_no_lang(result); + r.write_no_lang(ValuePtr(new VXnode(&pool, (GdomeNode *)returnAttr))); } else - throw Exception(0, 0, - &method_name, + throw Exception( + method_name, exc); } // Attr removeAttributeNode(in Attr oldAttr) raises(DOMException); -static void _removeAttributeNode(Request& r, const String& method_name, MethodParams *params) { +static void _removeAttributeNode(Request& r, StringPtr method_name, MethodParams* params) { Pool& pool=r.pool(); GdomeElement *element=get_self_element(r, method_name); GdomeAttr * oldAttr=as_attr(pool, method_name, params, 0, "oldAttr must be ATTRIBUTE node"); @@ -331,262 +328,286 @@ static void _removeAttributeNode(Request GdomeException exc; gdome_el_removeAttributeNode(element, oldAttr, &exc); if(exc) - throw Exception(0, 0, - &method_name, + throw Exception( + method_name, exc); } // NodeList getElementsByTagName(in DOMString name); -static void _getElementsByTagName(Request& r, const String& method_name, MethodParams *params) { +static void _getElementsByTagName(Request& r, StringPtr method_name, MethodParams* params) { Pool& pool=r.pool(); GdomeElement *element=get_self_element(r, method_name); - const String& name=params->as_string(0, "name must be string"); + StringPtr name=params->as_string(0, "name must be string"); - VHash& result=*new(pool) VHash(pool); + VHashPtr result(new VHash); GdomeException exc; if(GdomeNodeList *nodes= - gdome_el_getElementsByTagName(element, pool.transcode(name).get(), &exc)) { + gdome_el_getElementsByTagName(element, r.transcode(name).get(), &exc)) { gulong length=gdome_nl_length(nodes, &exc); for(gulong i=0; ihash(Exception::undefined_source).put( + skey, + ValuePtr(new VXnode(&pool, gdome_nl_item(nodes, i, &exc)))); } } else if(exc) - throw Exception(0, 0, - &method_name, + throw Exception( + method_name, exc); // write out result r.write_no_lang(result); } +static void _getElementsByTagNameNS(Request& r, StringPtr method_name, MethodParams* params) { + Pool& pool=r.pool(); + GdomeElement *element=get_self_element(r, method_name); + + // namespaceURI;localName + StringPtr namespaceURI=params->as_string(0, "namespaceURI must be string"); + StringPtr localName=params->as_string(1, "localName must be string"); + + GdomeException exc; + VHashPtr result(new VHash); + if(GdomeNodeList *nodes= + gdome_el_getElementsByTagNameNS( + element, + r.transcode(namespaceURI).get(), + r.transcode(localName).get(), + &exc)) { + gulong length=gdome_nl_length(nodes, &exc); + for(gulong i=0; ihash(Exception::undefined_source).put(skey, + ValuePtr(new VXnode(&pool, gdome_nl_item(nodes, i, &exc)))); + } + } + + // write out result + r.write_no_lang(result); +} + // void normalize(); -static void _normalize(Request& r, const String& method_name, MethodParams *) { +static void _normalize(Request& r, StringPtr method_name, MethodParams* ) { Pool& pool=r.pool(); - VXnode& vnode=*static_cast(r.self); - GdomeNode *selfNode=vnode.get_node(&method_name); + VXnode& vnode=GET_SELF(r, VXnode); + GdomeNode *selfNode=vnode.get_node(method_name); GdomeException exc; gdome_n_normalize(selfNode, &exc); if(exc) - throw Exception(0, 0, - &method_name, + throw Exception( + method_name, exc); } -static void _selectX(Request& r, const String& method_name, MethodParams *params, - void (*handler)(Pool& pool, - const String& expression, +static void _selectX(Request& r, StringPtr method_name, MethodParams* params, + void (*handler)(Request& r, + StringPtr expression, xmlXPathObject_auto_ptr res, - Value *& result)) { + ValuePtr& result)) { // _asm int 3; Pool& pool=r.pool(); - VXnode& vnode=*static_cast(r.self); + VXnode& vnode=GET_SELF(r, VXnode); // expression - const String& expression=params->as_string(0, "expression must be string"); + StringPtr expression=params->as_string(0, "expression must be string"); GdomeException exc; - GdomeNode *dome_node=vnode.get_node(&method_name); + 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())); + xmlXPathEvalExpression(BAD_CAST r.transcode(expression)->str, ctxt.get())); if(xmlHaveGenericErrors()) { GdomeException exc=0; - throw Exception(0, 0, - &expression, - exc); + throw Exception(expression, exc); } - Value *result=0; + ValuePtr result; if(res.get()) - handler(pool, expression, res, result); - if(result) { - result->set_name(method_name); - r.write_no_lang(*result); - } + handler(r, expression, res, result); + if(result) + r.write_no_lang(result); } -static void selectNodesHandler(Pool& pool, - const String& expression, +static void selectNodesHandler(Request& r, + StringPtr expression, xmlXPathObject_auto_ptr res, - Value *& result) { + ValuePtr& result) { + Pool& pool=r.pool(); + VHashPtr vhash(new VHash); 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) { + HashStringValue& hash=vhash->hash(Exception::undefined_source); + for(int i=0; inodesetval->nodeTab[0]))); + hash.put(skey, + ValuePtr(new VXnode(&pool, gdome_xml_n_mkref(res->nodesetval->nodeTab[i])))); + } } - result=vhash; - } break; default: - throw Exception(0, 0, - &expression, + throw Exception(Exception::undefined_type, + expression, "wrong xmlXPathEvalExpression result type (%d)", res->type); break; // never } } -static void selectNodeHandler(Pool& pool, - const String& expression, +static void selectNodeHandler(Request& r, + StringPtr expression, xmlXPathObject_auto_ptr res, - Value *& result) { + ValuePtr& result) { + Pool& pool=r.pool(); + switch(res->type) { 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, - &expression, - "resulted not in a single node (%d)", res->nodesetval->nodeNr); + throw Exception("parser.runtime", + expression, + "resulted not in a single node (%d)", res->nodesetval->nodeNr); - result=new(pool) VXnode(pool, gdome_xml_n_mkref(res->nodesetval->nodeTab[0])); + result=ValuePtr(new VXnode(&pool, gdome_xml_n_mkref(res->nodesetval->nodeTab[0]))); } break; case XPATH_BOOLEAN: - result=new(pool) VBool(pool, res->boolval!=0); + result=ValuePtr(new VBool(res->boolval!=0)); break; case XPATH_NUMBER: - result=new(pool) VDouble(pool, res->floatval); + result=ValuePtr(new VDouble(res->floatval)); break; case XPATH_STRING: - result=new(pool) VString( - pool.transcode( + result=ValuePtr(new VString( + r.transcode( GdomeDOMString_auto_ptr( - gdome_str_mkref_dup((const gchar *)res->stringval)).get())); + gdome_str_mkref_dup((const gchar *)res->stringval)).get(), expression))); break; default: - throw Exception(0, 0, - &expression, + throw Exception("parser.runtime", + expression, "wrong xmlXPathEvalExpression result type (%d)", res->type); break; // never } } -static void selectBoolHandler(Pool& pool, - const String& expression, +static void selectBoolHandler(Request& r, + StringPtr expression, xmlXPathObject_auto_ptr res, - Value *& result) { + ValuePtr& result) { + Pool& pool=r.pool(); switch(res->type) { case XPATH_BOOLEAN: - result=new(pool) VBool(pool, res->boolval!=0); + result=ValuePtr(new VBool(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, - &expression, + throw Exception("parser.runtime", + expression, "wrong xmlXPathEvalExpression result type (%d)", res->type); break; // never } } -static void selectNumberHandler(Pool& pool, - const String& expression, +static void selectNumberHandler(Request& r, + StringPtr expression, xmlXPathObject_auto_ptr res, - Value *& result) { + ValuePtr& result) { + Pool& pool=r.pool(); switch(res->type) { case XPATH_NUMBER: - result=new(pool) VDouble(pool, res->floatval); + result=ValuePtr(new VDouble(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, - &expression, + throw Exception("parser.runtime", + expression, "wrong xmlXPathEvalExpression result type (%d)", res->type); break; // never } } -static void selectStringHandler(Pool& pool, - const String& expression, +static void selectStringHandler(Request& r, + StringPtr expression, xmlXPathObject_auto_ptr res, - Value *& result) { + ValuePtr& result) { + Pool& pool=r.pool(); switch(res->type) { case XPATH_UNDEFINED: break; case XPATH_STRING: - result=new(pool) VString( - pool.transcode( + result=ValuePtr(new VString( + r.transcode( GdomeDOMString_auto_ptr( - gdome_str_mkref_dup((const gchar *)res->stringval)).get())); + gdome_str_mkref_dup((const gchar *)res->stringval)).get(), expression))); 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, - &expression, + 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) { +static void _select(Request& r, StringPtr method_name, MethodParams* params) { _selectX(r, method_name, params, selectNodesHandler); } -static void _selectSingle(Request& r, const String& method_name, MethodParams *params) { +static void _selectSingle(Request& r, StringPtr method_name, MethodParams* params) { _selectX(r, method_name, params, selectNodeHandler); } -static void _selectBool(Request& r, const String& method_name, MethodParams *params) { +static void _selectBool(Request& r, StringPtr method_name, MethodParams* params) { _selectX(r, method_name, params, selectBoolHandler); } -static void _selectNumber(Request& r, const String& method_name, MethodParams *params) { +static void _selectNumber(Request& r, StringPtr method_name, MethodParams* params) { _selectX(r, method_name, params, selectNumberHandler); } -static void _selectString(Request& r, const String& method_name, MethodParams *params) { +static void _selectString(Request& r, StringPtr 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(const char* aname, VStateless_class *abase): + Methoded(aname?aname:"xnode", abase) +{ /// DOM1 node // Node insertBefore(in Node newChild,in Node refChild) raises(DOMException); @@ -618,6 +639,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); @@ -637,7 +660,7 @@ MXnode::MXnode(Pool& apool) : Methoded(a // consts #define CONST(name) \ - consts.put(*new(pool()) String(pool(), #name), new(pool()) VInt(pool(), GDOME_##name)) + consts.put(StringPtr(new String(#name)), ValuePtr(new VInt(GDOME_##name))) CONST(ELEMENT_NODE); CONST(ATTRIBUTE_NODE); @@ -654,19 +677,10 @@ MXnode::MXnode(Pool& apool) : Methoded(a } -// global variable +#else -Methoded *Xnode_class; +// global variable -#endif +DECLARE_CLASS_VAR(xnode, 0, 0); // fictive -// creator -Methoded *MXnode_create(Pool& pool) { - return -#ifdef XML - Xnode_class=new(pool) MXnode(pool) -#else - 0 #endif - ; -}