--- parser3/src/classes/xnode.C 2002/01/28 10:50:03 1.35 +++ parser3/src/classes/xnode.C 2005/08/09 08:14:48 1.71 @@ -1,32 +1,30 @@ /** @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.35 2002/01/28 10:50:03 paf Exp $ + Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexandr Petrosian (http://paf.design.ru) */ #include "classes.h" #ifdef XML +static const char * const IDENT_XNODE_C="$Date: 2005/08/09 08:14:48 $"; + +#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 "pa_xml_exception.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" +#include "libxml/xpathInternals.h" -// defines +// global variable -#define XNODE_CLASS_NAME "xnode" +DECLARE_CLASS_VAR(xnode, new MXnode, 0); // classes @@ -98,28 +96,30 @@ private: // 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 - || strcmp(value.type(), VXDOC_TYPE)!=0) - throw Exception(0, 0, - &method_name, +GdomeNode* as_node(MethodParams& params, + int index, const char* msg) { + GdomeNode* result; + Value& value=params.as_no_junction(index, msg); + if(Value* vxnode=value.as(VXNODE_TYPE, false)) + result=static_cast(vxnode)->get_node(); + else { + throw Exception("parser.runtime", + 0, msg); + } - VXnode& vnode=*static_cast(&value); - return vnode.get_node(&method_name); + return result; } // 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(MethodParams& params, + int index, const char* msg) { + GdomeNode* node=as_node(params, index, msg); GdomeException exc; if(gdome_n_nodeType(node, &exc)!=GDOME_ATTRIBUTE_NODE) - throw Exception(0, 0, - &method_name, + throw Exception("parser.runtime", + 0, msg); return GDOME_A(node); @@ -130,463 +130,582 @@ 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) { - 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"); +static void _insertBefore(Request& r, MethodParams& params) { + VXnode& vnode=GET_SELF(r, VXnode); + GdomeNode* selfNode=vnode.get_node(); + GdomeNode* newChild=as_node(params, 0, "newChild must be node"); + GdomeNode* refChild=as_node(params, 1, "refChild must be node"); GdomeException exc; - if(GdomeNode *retNode=gdome_n_insertBefore(selfNode, newChild, refChild, &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(*new VXnode(&r.charsets, vnode.get_xdoc(), retNode)); } else - throw Exception(0, 0, - &method_name, - exc); + throw XmlException(0, exc); } // 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); - 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"); +static void _replaceChild(Request& r, MethodParams& params) { + VXnode& vnode=GET_SELF(r, VXnode); + GdomeNode* selfNode=vnode.get_node(); + GdomeNode* newChild=as_node(params, 0, "newChild must be node"); + GdomeNode* oldChild=as_node(params, 1, "oldChild must be node"); GdomeException exc; - if(GdomeNode *retNode=gdome_n_replaceChild(selfNode, newChild, refChild, &exc)) { + if(GdomeNode* retNode=gdome_n_replaceChild(selfNode, newChild, oldChild, &exc)) { // write out result - r.write_no_lang(*new(pool) VXnode(pool, retNode)); + r.write_no_lang(*new VXnode(&r.charsets, vnode.get_xdoc(), retNode)); } else - throw Exception(0, 0, - &method_name, - exc); + throw XmlException(0, exc); } // 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); - GdomeNode *selfNode=vnode.get_node(&method_name); - GdomeNode *oldChild=as_node(pool, method_name, params, 0, "oldChild must be node"); +static void _removeChild(Request& r, MethodParams& params) { + VXnode& vnode=GET_SELF(r, VXnode); + GdomeNode* selfNode=vnode.get_node(); + GdomeNode* oldChild=as_node(params, 0, "oldChild must be node"); GdomeException exc; - if(GdomeNode *retNode=gdome_n_removeChild(selfNode, oldChild, &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(*new VXnode(&r.charsets, vnode.get_xdoc(), retNode)); } else - throw Exception(0, 0, - &method_name, - exc); + throw XmlException(0, exc); } // 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); - GdomeNode *selfNode=vnode.get_node(&method_name); - GdomeNode *newChild=as_node(pool, method_name, params, 0, "newChild must be node"); +static void _appendChild(Request& r, MethodParams& params) { + VXnode& vnode=GET_SELF(r, VXnode); + GdomeNode* selfNode=vnode.get_node(); + GdomeNode* newChild=as_node(params, 0, "newChild must be node"); GdomeException exc; - if(GdomeNode *retNode=gdome_n_appendChild(selfNode, newChild, &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(*new VXnode(&r.charsets, vnode.get_xdoc(), retNode)); } else - throw Exception(0, 0, - &method_name, - exc); + throw XmlException(0, exc); } // boolean hasChildNodes(); -static void _hasChildNodes(Request& r, const String& method_name, MethodParams *) { - Pool& pool=r.pool(); - VXnode& vnode=*static_cast(r.self); - GdomeNode *node=vnode.get_node(&method_name); +static void _hasChildNodes(Request& r, MethodParams&) { + VXnode& vnode=GET_SELF(r, VXnode); + GdomeNode* node=vnode.get_node(); 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 VBool(result)); } // Node cloneNode(in boolean deep); -static void _cloneNode(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - VXnode& vnode=*static_cast(r.self); - GdomeNode *node=vnode.get_node(&method_name); +static void _cloneNode(Request& r, MethodParams& params) { + VXnode& vnode=GET_SELF(r, VXnode); + GdomeNode* node=vnode.get_node(); - bool deep=params->as_bool(0, "deep must be bool", r); + 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 VXnode(&r.charsets, vnode.get_xdoc(), 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); - GdomeNode *node=vnode.get_node(&method_name); +GdomeElement* get_self_element(VXnode& vnode) { + GdomeNode* node=vnode.get_node(); 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", + 0, + "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) { - Pool& pool=r.pool(); - GdomeElement *element=get_self_element(r, method_name); - const String& name=params->as_string(0, "name must be string"); + + +/// @bug attribute_value must be freed! [// DOMString getAttribute(in DOMString name); +static void _getAttribute(Request& r, MethodParams& params) { + VXnode& vnode=GET_SELF(r, VXnode); + GdomeElement* element=get_self_element(vnode); + const String& 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).use(), &exc); // write out result - r.write_no_lang(*new(pool) VString(pool.transcode(attribute_value))); + r.write_pass_lang(r.transcode(attribute_value)); } // void setAttribute(in DOMString name, in DOMString value) raises(DOMException); -static void _setAttribute(Request& r, const String& 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"); +static void _setAttribute(Request& r, MethodParams& params) { + VXnode& vnode=GET_SELF(r, VXnode); + GdomeElement* element=get_self_element(vnode); + const String& name=params.as_string(0, "name must be string"); + const String& 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).use(), + r.transcode(attribute_value).use(), &exc); if(exc) - throw Exception(0, 0, - &method_name, - exc); + throw XmlException(0, exc); } // void removeAttribute(in DOMString name) raises(DOMException); -static void _removeAttribute(Request& r, const String& 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"); +static void _removeAttribute(Request& r, MethodParams& params) { + VXnode& vnode=GET_SELF(r, VXnode); + GdomeElement* element=get_self_element(vnode); + const String& 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).use(), &exc); if(exc) - throw Exception(0, 0, - &method_name, - exc); + throw XmlException(0, exc); } // Attr getAttributeNode(in DOMString name); -static void _getAttributeNode(Request& r, const String& 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"); +static void _getAttributeNode(Request& r, MethodParams& params) { + VXnode& vnode=GET_SELF(r, VXnode); + GdomeElement* element=get_self_element(vnode); + const String& 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).use(), &exc)) { // write out result - VXnode& result=*new(pool) VXnode(pool, (GdomeNode *)attr); - r.write_no_lang(result); + r.write_no_lang(*new VXnode(&r.charsets, vnode.get_xdoc(), (GdomeNode* )attr)); } else if(exc) - throw Exception(0, 0, - &method_name, - exc); + throw XmlException(0, exc); } // Attr setAttributeNode(in Attr newAttr) raises(DOMException); -static void _setAttributeNode(Request& r, const String& 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"); +static void _setAttributeNode(Request& r, MethodParams& params) { + VXnode& vnode=GET_SELF(r, VXnode); + GdomeElement* element=get_self_element(vnode); + GdomeAttr * newAttr=as_attr(params, 0, "newAttr must be ATTRIBUTE node"); 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(*new VXnode(&r.charsets, vnode.get_xdoc(), (GdomeNode* )returnAttr)); } else - throw Exception(0, 0, - &method_name, - exc); + throw XmlException(0, exc); } // Attr removeAttributeNode(in Attr oldAttr) raises(DOMException); -static void _removeAttributeNode(Request& r, const String& 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"); +static void _removeAttributeNode(Request& r, MethodParams& params) { + VXnode& vnode=GET_SELF(r, VXnode); + GdomeElement* element=get_self_element(vnode); + GdomeAttr * oldAttr=as_attr(params, 0, "oldAttr must be ATTRIBUTE node"); GdomeException exc; gdome_el_removeAttributeNode(element, oldAttr, &exc); if(exc) - throw Exception(0, 0, - &method_name, - exc); + throw XmlException(0, exc); } // NodeList getElementsByTagName(in DOMString name); -static void _getElementsByTagName(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - GdomeElement *element=get_self_element(r, method_name); +static void _getElementsByTagName(Request& r, MethodParams& params) { + VXnode& vnode=GET_SELF(r, VXnode); + GdomeElement* element=get_self_element(vnode); - const String& name=params->as_string(0, "name must be string"); + const String& name=params.as_string(0, "name must be string"); - VHash& result=*new(pool) VHash(pool); + VHash& result=*new VHash; GdomeException exc; if(GdomeNodeList *nodes= - gdome_el_getElementsByTagName(element, pool.transcode(name).get(), &exc)) { + gdome_el_getElementsByTagName(element, r.transcode(name).use(), &exc)) { gulong length=gdome_nl_length(nodes, &exc); - for(gulong i=0; i(r.self); - GdomeNode *selfNode=vnode.get_node(&method_name); +static void _normalize(Request& r, MethodParams&) { + VXnode& vnode=GET_SELF(r, VXnode); + GdomeNode* selfNode=vnode.get_node(); GdomeException exc; gdome_n_normalize(selfNode, &exc); if(exc) - throw Exception(0, 0, - &method_name, - exc); + throw XmlException(0, exc); } -static void _selectX(Request& r, const String& method_name, MethodParams *params, - void (*handler)(Pool& pool, +#ifndef DOXYGEN +struct Register_one_ns_info { + Request* r; + xmlXPathContextPtr ctxt; +}; +#endif +static void register_one_ns( + HashStringValue::key_type key, + HashStringValue::value_type value, + Register_one_ns_info* info) { + if(const String* svalue=value->get_string()) + xmlXPathRegisterNs(info->ctxt, + BAD_CAST info->r->transcode(key)->str, + BAD_CAST info->r->transcode(*svalue)->str); + else + throw Exception("parser.runtime", + new String(key, String::L_TAINTED), + "value is %s, must be string or number", value->type()); +} +static void _selectX(Request& r, MethodParams& params, + void (*handler)(Request& r, const String& expression, xmlXPathObject_auto_ptr res, - Value *& result)) { -// _asm int 3; - Pool& pool=r.pool(); - VXnode& vnode=*static_cast(r.self); + VXdoc& xdoc, + Value*& result)) { + VXnode& vnode=GET_SELF(r, VXnode); // expression - const String& expression=params->as_string(0, "expression must be string"); - + const String& 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(); GdomeDocument *dome_document=gdome_n_ownerDocument(dome_node, &exc); 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)); + xmlXPathContext_auto_ptr ctxt(xmlXPathNewContext(xml_document)); + { + Register_one_ns_info info={&r, ctxt.get()}; + vnode.get_xdoc().search_namespaces.hash().for_each(register_one_ns, &info); + } 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 XmlException(&expression, exc); } - Value *result=0; + Value* result=0; if(res.get()) - handler(pool, expression, res, result); - if(result) { - result->set_name(method_name); + handler(r, expression, res, vnode.get_xdoc(), 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; +static void selectNodesHandler(Request& r, + const String& expression, + xmlXPathObject_auto_ptr res, + VXdoc& xdoc, + Value*& result) { + VHash& vhash=*new VHash; result=&vhash; switch(res->type) { case XPATH_UNDEFINED: break; case XPATH_NODESET: - if(int size=res->nodesetval->nodeNr) { - Hash& hash=vhash->hash(0); - for(int i=0; inodesetval->nodeTab[i]))); + if(res->nodesetval) + if(int size=res->nodesetval->nodeNr) { + HashStringValue& hash=vhash.hash(); + for(int i=0; inodesetval->nodeTab[i]))); } - } break; default: - throw Exception(0, 0, + 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) { +static void selectNodeHandler(Request& r, + const String& expression, + xmlXPathObject_auto_ptr res, + VXdoc& xdoc, + Value*& result) { 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=new VXnode( + &r.charsets, + xdoc, + gdome_xml_n_mkref(res->nodesetval->nodeTab[0])); } break; case XPATH_BOOLEAN: - result=new(pool) VBool(pool, res->boolval!=0); + result=new VBool(res->boolval!=0); break; case XPATH_NUMBER: - result=new(pool) VDouble(pool, res->floatval); + result=new VDouble(res->floatval); break; case XPATH_STRING: - result=new(pool) VString( - pool.transcode( - GdomeDOMString_auto_ptr( - gdome_str_mkref_dup((const gchar *)res->stringval)).get())); + result=new VString(r.transcode((xmlChar*)res->stringval)); break; default: - throw Exception(0, 0, + throw Exception("parser.runtime", &expression, "wrong xmlXPathEvalExpression result type (%d)", res->type); + // result=0; break; // never } } -static void selectBoolHandler(Pool& pool, - const String& expression, - xmlXPathObject_auto_ptr res, - Value *& result) { +static void selectBoolHandler(Request&, + const String& expression, + xmlXPathObject_auto_ptr res, + VXdoc& /*xdoc*/, + Value*& result) { switch(res->type) { case XPATH_BOOLEAN: - result=new(pool) VBool(pool, res->boolval!=0); + result=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, + 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) { +static void selectNumberHandler(Request&, + const String& expression, + xmlXPathObject_auto_ptr res, + VXdoc& /*xdoc*/, + Value*& result) { switch(res->type) { case XPATH_NUMBER: - result=new(pool) VDouble(pool, res->floatval); + result=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, + throw Exception("parser.runtime", &expression, "wrong xmlXPathEvalExpression result type (%d)", res->type); break; // never } } -static void selectStringHandler(Pool& pool, +static void selectStringHandler(Request& r, const String& expression, xmlXPathObject_auto_ptr res, - Value *& result) { + VXdoc& /*xdoc*/, + 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())); + result=new VString(r.transcode((xmlChar*)res->stringval)); 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 } } -static void _select(Request& r, const String& method_name, MethodParams *params) { - _selectX(r, method_name, params, +static void _select(Request& r, MethodParams& params) { + _selectX(r, params, selectNodesHandler); } -static void _selectSingle(Request& r, const String& method_name, MethodParams *params) { - _selectX(r, method_name, params, +static void _selectSingle(Request& r, MethodParams& params) { + _selectX(r, params, selectNodeHandler); } -static void _selectBool(Request& r, const String& method_name, MethodParams *params) { - _selectX(r, method_name, params, +static void _selectBool(Request& r, MethodParams& params) { + _selectX(r, params, selectBoolHandler); } -static void _selectNumber(Request& r, const String& method_name, MethodParams *params) { - _selectX(r, method_name, params, +static void _selectNumber(Request& r, MethodParams& params) { + _selectX(r, params, selectNumberHandler); } -static void _selectString(Request& r, const String& method_name, MethodParams *params) { - _selectX(r, method_name, params, +static void _selectString(Request& r, MethodParams& params) { + _selectX(r, params, selectStringHandler); } // constructor -MXnode::MXnode(Pool& apool) : Methoded(apool), - consts(apool) { - set_name(*NEW String(pool(), XNODE_CLASS_NAME)); - +/// @bug one can change const and ruin other's work, we need unchangable VIntConst class +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,9 +737,28 @@ 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); + /// DOM2 element + + // DOMString getAttributeNS(in DOMString namespaceURI, in DOMString localName); + add_native_method("getAttributeNS", Method::CT_DYNAMIC, _getAttributeNS, 2, 2); + // void setAttributeNS(in DOMString namespaceURI, in DOMString qualifiedName, in DOMString value) raises(DOMException); + add_native_method("setAttributeNS", Method::CT_DYNAMIC, _setAttributeNS, 3, 3); + // void removeAttributeNS(in DOMString namespaceURI, in DOMString localName) raises(DOMException); + add_native_method("removeAttributeNS", Method::CT_DYNAMIC, _removeAttributeNS, 2, 2); + // Attr getAttributeNodeNS(in DOMString namespaceURI, in DOMString localName); + add_native_method("getAttributeNodeNS", Method::CT_DYNAMIC, _getAttributeNodeNS, 2, 2); + // Attr setAttributeNodeNS(in Attr newAttr) raises(DOMException); + add_native_method("setAttributeNodeNS", Method::CT_DYNAMIC, _setAttributeNodeNS, 1, 1); + // boolean hasAttribute(in DOMString name) raises(DOMException); + add_native_method("hasAttribute", Method::CT_DYNAMIC, _hasAttribute, 1, 1); + // boolean hasAttributeNS(in DOMString namespaceURI, in DOMString localName) raises(DOMException); + add_native_method("hasAttributeNS", Method::CT_DYNAMIC, _hasAttributeNS, 2, 2); + /// parser // ^node.select[/some/xpath/query] = hash $.#[dnode] add_native_method("select", Method::CT_DYNAMIC, _select, 1, 1); @@ -637,36 +775,26 @@ 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(String::Body(#name), new VInt(GDOME_##name)) CONST(ELEMENT_NODE); - CONST(ATTRIBUTE_NODE); - CONST(TEXT_NODE); - CONST(CDATA_SECTION_NODE); - CONST(ENTITY_REFERENCE_NODE); - CONST(ENTITY_NODE); - CONST(PROCESSING_INSTRUCTION_NODE); - CONST(COMMENT_NODE); - CONST(DOCUMENT_NODE); - CONST(DOCUMENT_TYPE_NODE); - CONST(DOCUMENT_FRAGMENT_NODE); - CONST(NOTATION_NODE); - + CONST(ATTRIBUTE_NODE); + CONST(TEXT_NODE); + CONST(CDATA_SECTION_NODE); + CONST(ENTITY_REFERENCE_NODE); + CONST(ENTITY_NODE); + CONST(PROCESSING_INSTRUCTION_NODE); + CONST(COMMENT_NODE); + CONST(DOCUMENT_NODE); + CONST(DOCUMENT_TYPE_NODE); + CONST(DOCUMENT_FRAGMENT_NODE); + CONST(NOTATION_NODE); } -// 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 - ; -}