--- parser3/src/classes/xnode.C 2002/01/14 17:48:56 1.27 +++ parser3/src/classes/xnode.C 2007/08/20 08:56:46 1.78 @@ -1,34 +1,38 @@ /** @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.27 2002/01/14 17:48:56 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: 2007/08/20 08:56:46 $"; + +#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 "pa_vbool.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" + +// 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 +64,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,495 +95,740 @@ private: xmlXPathContext *_Ptr; }; -// defines +// helpers -#define XNODE_CLASS_NAME "xnode" +xmlNode& as_node(MethodParams& params, int index, const char* msg) { + Value& value=params.as_no_junction(index, msg); + if(Value* vxnode=value.as(VXNODE_TYPE, false)) + return static_cast(vxnode)->get_xmlnode(); + else + throw Exception(PARSER_RUNTIME, + 0, + msg); +} -// helpers +xmlChar* as_xmlchar(Request& r, MethodParams& params, int index, const char* msg) { + return r.transcode(params.as_string(index, msg)); +} -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, +xmlAttr& as_attr(MethodParams& params, int index, const char* msg) { + xmlNode& xmlnode=as_node(params, index, msg); + if(xmlnode.type!=XML_ATTRIBUTE_NODE) + throw Exception(PARSER_RUNTIME, + 0, msg); - VXnode& vnode=*static_cast(&value); - return vnode.get_node(&method_name); + return *(xmlAttr*)&xmlnode; } -// helpers +static void writeNode(Request& r, VXdoc& xdoc, xmlNode* node) { + if(!node|| xmlHaveGenericErrors()) + throw XmlException(0); // OOM, bad name, things like that -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); - GdomeException exc; - if(gdome_n_nodeType(node, &exc)!=GDOME_ATTRIBUTE_NODE) - throw Exception(0, 0, - &method_name, - msg); + // write out result + r.write_no_lang(xdoc.wrap(*node)); +} + +static xmlNode* pa_getAttributeNodeNS(xmlNode& selfNode, + const xmlChar* localName, + const xmlChar* namespaceURI) +{ + for(xmlNode* currentNode=(xmlNode*)selfNode.properties; + currentNode; + currentNode=currentNode->next) + { + if(!namespaceURI || currentNode->ns && xmlStrEqual(currentNode->ns->href, namespaceURI)) + if(!localName || xmlStrEqual(currentNode->name, localName)) + return currentNode; + } + return 0; +} + +xmlNs& pa_xmlMapNs(xmlDoc& doc, const xmlChar *href, const xmlChar *prefix) { + assert(href); + // prefix can be null + + xmlNs *cur=doc.oldNs; + while (cur != NULL && + ((cur->prefix == NULL && prefix != NULL) || + (cur->prefix != NULL && prefix == NULL) || + !xmlStrEqual (cur->prefix, prefix)) && + !xmlStrEqual (cur->href, href)) + cur = cur->next; + + if (cur == NULL) { + cur = xmlNewNs (NULL, href, prefix); + if(!cur || xmlHaveGenericErrors()) + throw XmlException(0); + cur->next = doc.oldNs; + doc.oldNs = cur; + } + + return *cur; +} - return GDOME_A(node); +/// todo: проверить, обновляется ли parent! +static void pa_addAttributeNode(xmlNode& selfNode, xmlAttr& attrNode) +{ + if(attrNode.type!=XML_ATTRIBUTE_NODE) + throw Exception(PARSER_RUNTIME, + 0, + "must be ATTRIBUTE_NODE"); + + /* + * Add it at the end to preserve parsing order ... + */ + if (selfNode.properties == NULL) { + selfNode.properties = &attrNode; + } else { + xmlAttrPtr prev = selfNode.properties; + + while (prev->next != NULL) + prev = prev->next; + prev->next = &attrNode; + attrNode.prev = prev; + } + + if (xmlIsID(selfNode.doc, &selfNode, &attrNode) == 1) + xmlAddID(NULL, selfNode.doc, xmlNodeGetContent((xmlNode*)&attrNode), &attrNode); +} + +static const xmlChar * +pa_xmlGetNsURI(xmlNode *node) { + if (node == NULL || node->ns == NULL) + return NULL; + + return node->ns->href; +} + +#ifndef DOXYGEN +struct AccumulateFoundInfo +{ + HashStringValue* hash; + VXdoc* vdoc; + int index; +}; +#endif +static void AccumulateFound(xmlNode& node, AccumulateFoundInfo* info) +{ + info->hash->put( + String::Body::Format(info->index++), + &info->vdoc->wrap(node)); +} +template static void +pa_xmlNamedPreorderTraversal ( + xmlNode *root, + xmlChar *tagURI, + xmlChar *tagName, + void callback(xmlNode& node, I info), + I info) +{ + for(xmlNode *iter=root->children; iter; iter = iter->next) { + if(iter->type == XML_ELEMENT_NODE && + (xmlStrEqual(iter->name, tagName) || + xmlStrEqual(tagName, (const xmlChar*)"*"))) { + if(tagURI != NULL && + (xmlStrEqual(pa_xmlGetNsURI(iter), tagURI) || + xmlStrEqual(tagURI, (const xmlChar*)"*"))) + callback(*iter, info); + else if(tagURI == NULL) + callback(*iter, info); + } + pa_xmlNamedPreorderTraversal(iter, tagURI, tagName, callback, info); + } + + return; } + // methods // 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); + VXdoc& vxdoc=vnode.get_vxdoc(); + + //xmlNode& selfNode=vnode.get_xmlnode(); + xmlNode& newChild=as_node(params, 0, "newChild must be node"); + xmlNode& refChild=as_node(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); - } else - throw Exception(0, 0, - &method_name, - exc); + xmlNode* retNode=xmlAddPrevSibling(&refChild, &newChild); + // write out result + writeNode(r, vxdoc, retNode); } // 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"); - - 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, - &method_name, - exc); +static void _replaceChild(Request& r, MethodParams& params) { + VXnode& vnode=GET_SELF(r, VXnode); + VXdoc& vxdoc=vnode.get_vxdoc(); + xmlDoc& xmldoc=vxdoc.get_xmldoc(); + xmlNode& selfNode=vnode.get_xmlnode(); + xmlNode& newChild=as_node(params, 0, "newChild must be node"); + xmlNode& oldChild=as_node(params, 1, "oldChild must be node"); + + if(newChild.doc!=&xmldoc) + throw Exception("xml.dom", + 0, + "WRONG_DOCUMENT_ERR"); + if(oldChild.doc!=&xmldoc) + throw Exception("xml.dom", + 0, + "WRONG_DOCUMENT_ERR"); + + if(oldChild.parent!=&selfNode) + throw Exception("xml.dom", + 0, + "NOT_FOUND_ERR"); + + xmlNode* refChild=oldChild.next; + xmlUnlinkNode(&oldChild); + xmlNode* retNode; + if(refChild) + retNode=xmlAddPrevSibling(refChild, &newChild); + else + retNode=xmlAddChild(&selfNode, &newChild); + + // write out result + writeNode(r, vxdoc, retNode); } // 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); + VXdoc& vxdoc=vnode.get_vxdoc(); + xmlDoc& xmldoc=vxdoc.get_xmldoc(); +// xmlNode& selfNode=vnode.get_xmlnode(); + xmlNode& oldChild=as_node(params, 0, "refChild 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, - &method_name, - exc); + if(oldChild.doc!=&xmldoc) + throw Exception("xml.dom", + 0, + "WRONG_DOCUMENT_ERR"); + + xmlUnlinkNode(&oldChild); + // write out result + writeNode(r, vxdoc, &oldChild); } // 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); + VXdoc& vxdoc=vnode.get_vxdoc(); + xmlNode& selfNode=vnode.get_xmlnode(); + xmlNode& newChild=as_node(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, - &method_name, - exc); + xmlNode* retNode=xmlAddChild(&selfNode, &newChild); + // write out result + writeNode(r, vxdoc, retNode); } // 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); + xmlNode& node=vnode.get_xmlnode(); - 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=node.children!=0; + r.write_no_lang(*new VBool(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); - GdomeNode *node=vnode.get_node(&method_name); +static void _cloneNode(Request& r, MethodParams& params) { + VXnode& vnode=GET_SELF(r, VXnode); + xmlNode& selfNode=vnode.get_xmlnode(); + VXdoc& vxdoc=vnode.get_vxdoc(); + xmlDoc& xmldoc=vxdoc.get_xmldoc(); - bool deep=params->as_bool(0, "deep must be bool", r); + bool deep=params.as_bool(0, "deep must be bool", r); - GdomeException exc; + xmlNode* retNode=xmlDocCopyNode(&selfNode, &xmldoc, deep?1: 0); // 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); + writeNode(r, vxdoc, retNode); } // 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); - - 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"); - - 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"); - - GdomeException exc; - GdomeDOMString *attribute_value= - gdome_el_getAttribute(element, pool.transcode(name).get(), &exc); +xmlNode& get_self_element(VXnode& vnode) { + xmlNode& node=vnode.get_xmlnode(); + + if(node.type!=XML_ELEMENT_NODE) + throw Exception(PARSER_RUNTIME, + 0, + "method can only be called on nodes of ELEMENT type"); + + return node; +} + + +static void _getAttribute(Request& r, MethodParams& params) { + VXnode& vnode=GET_SELF(r, VXnode); + xmlNode& element=get_self_element(vnode); + const xmlChar* name=as_xmlchar(r, params, 0, "name must be string"); + + // todo: when name="xmlns" + xmlChar* attribute_value=xmlGetProp(&element, name); // 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"); - - GdomeException exc; - gdome_el_setAttribute(element, - pool.transcode(name).get(), - pool.transcode(attribute_value).get(), - &exc); - if(exc) - throw Exception(0, 0, - &method_name, - exc); +static void _setAttribute(Request& r, MethodParams& params) { + VXnode& vnode=GET_SELF(r, VXnode); + xmlNode& element=get_self_element(vnode); + const xmlChar* name=as_xmlchar(r, params, 0, "name must be string"); + const xmlChar* attribute_value=as_xmlchar(r, params, 1, "value must be string"); + + // todo: when name="xmlns" + if(!xmlSetProp(&element, name, attribute_value)) + throw XmlException(0); } // 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); + xmlNode& element=get_self_element(vnode); + const xmlChar* name=as_xmlchar(r, params, 0, "name must be string"); - GdomeException exc; - gdome_el_removeAttribute(element, pool.transcode(name).get(), &exc); - if(exc) - throw Exception(0, 0, - &method_name, - exc); + // todo: when name="xmlns" + xmlUnsetProp(&element, name); } // 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); + VXdoc& vxdoc=vnode.get_vxdoc(); + xmlNode& element=get_self_element(vnode); + const xmlChar* localName=as_xmlchar(r, params, 0, "name must be string"); - GdomeException exc; - if(GdomeAttr *attr=gdome_el_getAttributeNode(element, pool.transcode(name).get(), &exc)) { + if(xmlNode* retNode=pa_getAttributeNodeNS(element, localName, 0)){ // write out result - VXnode& result=*new(pool) VXnode(pool, (GdomeNode *)attr); - r.write_no_lang(result); - } else if(exc) - throw Exception(0, 0, - &method_name, - exc); + writeNode(r, vxdoc, retNode); + } } // 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"); - - GdomeException exc; - if(GdomeAttr *returnAttr=gdome_el_setAttributeNode(element, newAttr, &exc)) { +// Attr setAttributeNodeNS(in Attr newAttr) raises(DOMException); +static void _setAttributeNode(Request& r, MethodParams& params) { + VXnode& vnode=GET_SELF(r, VXnode); + VXdoc& vxdoc=vnode.get_vxdoc(); + xmlNode& element=get_self_element(vnode); + xmlDoc& xmldoc=vxdoc.get_xmldoc(); + xmlAttr& newAttr=as_attr(params, 0, "newAttr must be ATTRIBUTE node"); + + if(newAttr.doc!=&xmldoc) + throw Exception("xml.dom", + 0, + "WRONG_DOCUMENT_ERR"); + + if(newAttr.parent) + throw Exception("xml.dom", + 0, + "INUSE_ATTRIBUTE_ERR"); + + if(xmlNode* retNode=pa_getAttributeNodeNS(element, newAttr.name, pa_xmlGetNsURI((xmlNode*)&newAttr))) { // write out result - VXnode& result=*new(pool) VXnode(pool, (GdomeNode *)returnAttr); - r.write_no_lang(result); - } else - throw Exception(0, 0, - &method_name, - exc); + writeNode(r, vxdoc, retNode); + xmlUnlinkNode(retNode); + } + + pa_addAttributeNode(element, newAttr); } // 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); + VXdoc& vxdoc=vnode.get_vxdoc(); + xmlNode& element=get_self_element(vnode); + xmlAttr& oldAttr=as_attr(params, 0, "oldAttr must be ATTRIBUTE node"); + + if(oldAttr.parent!=&element) + throw Exception("xml.dom", + 0, + "NOT_FOUND_ERR"); - GdomeException exc; - gdome_el_removeAttributeNode(element, oldAttr, &exc); - if(exc) - throw Exception(0, 0, - &method_name, - exc); + xmlUnlinkNode((xmlNode*)&oldAttr); + + // write out result + writeNode(r, vxdoc, (xmlNode*)&oldAttr); } // 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); - - const String& name=params->as_string(0, "name must be string"); - - VHash& result=*new(pool) VHash(pool); - GdomeException exc; - if(GdomeNodeList *nodes= - gdome_el_getElementsByTagName(element, pool.transcode(name).get(), &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&, MethodParams&) { +/*maybe someday + VXnode& vnode=GET_SELF(r, VXnode); + xmlNode& selfNode=vnode.get_xmlnode(); - 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, + info->r->transcode(key), + info->r->transcode(*svalue)); + 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); + xmlNode& xmlnode=vnode.get_xmlnode(); + VXdoc& vdoc=vnode.get_vxdoc(); + xmlDoc& xmldoc=vdoc.get_xmldoc(); // expression - const String& expression=params->as_string(0, "expression must be string"); - - 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; - xmlXPathContext_auto_ptr ctxt(xmlXPathNewContext(xml_document)); - ctxt->node=xmlDocGetRootElement(xml_document); + const String& expression=params.as_string(0, "expression must be string"); + xmlXPathContext_auto_ptr ctxt(xmlXPathNewContext(&xmldoc)); + { + Register_one_ns_info info={&r, ctxt.get()}; + vdoc.search_namespaces.hash().for_each(register_one_ns, &info); + } + ctxt->node=&xmlnode; /*error to stderr for now*/ xmlXPathObject_auto_ptr res( - xmlXPathEvalExpression(BAD_CAST pool.transcode(expression)->str, ctxt.get())); + xmlXPathEvalExpression(r.transcode(expression), ctxt.get())); - Value *result=0; + if(xmlHaveGenericErrors()) + throw XmlException(0); + + Value* result=0; if(res.get()) - handler(pool, expression, res, result); - if(result) { - result->set_name(method_name); + handler(r, expression, res, vdoc, result); + if(result) r.write_no_lang(*result); - } } -static void selectNodesHandler(Pool& pool, - const String& expression, - xmlXPathObject_auto_ptr res, - Value *& result) { +static void selectNodesHandler(Request&, + 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) { - VHash *vhash=new(pool) VHash(pool); - Hash& hash=vhash->hash(0); - for(int i=0; inodesetval->nodeTab[0]))); + if(res->nodesetval) + if(int size=res->nodesetval->nodeNr) { + HashStringValue& hash=vhash.hash(); + for(int i=0; inodesetval->nodeTab[i])); } - result=vhash; - } break; default: - throw Exception(0, 0, + throw Exception(PARSER_RUNTIME, &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=&xdoc.wrap(*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); - 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); @@ -611,9 +860,31 @@ 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, _setAttributeNode, 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); + // boolean hasAttributes + add_native_method("hasAttributes", Method::CT_DYNAMIC, _hasAttributes, 0, 0); + + /// parser // ^node.select[/some/xpath/query] = hash $.#[dnode] add_native_method("select", Method::CT_DYNAMIC, _select, 1, 1); @@ -630,36 +901,28 @@ 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(XML_##name)) +#define CONST2(name, value) \ + consts.put(String::Body(#name), new VInt(value)) 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); + CONST2(ENTITY_REFERENCE_NODE, XML_ENTITY_REF_NODE); + CONST(ENTITY_NODE); + CONST2(PROCESSING_INSTRUCTION_NODE, XML_PI_NODE); + CONST(COMMENT_NODE); + CONST(DOCUMENT_NODE); + CONST(DOCUMENT_TYPE_NODE); + CONST2(DOCUMENT_FRAGMENT_NODE, XML_DOCUMENT_FRAG_NODE); + CONST(NOTATION_NODE); } +#else + // global variable -Methoded *Xnode_class; +DECLARE_CLASS_VAR(xnode, 0, 0); // fictive #endif - -// creator -Methoded *MXnode_create(Pool& pool) { - return -#ifdef XML - Xnode_class=new(pool) MXnode(pool) -#else - 0 -#endif - ; -}