--- parser3/src/classes/xnode.C 2003/09/25 09:15:02 1.59 +++ parser3/src/classes/xnode.C 2004/03/10 10:42:11 1.67 @@ -1,13 +1,13 @@ /** @file Parser: @b dom parser class. - Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2004 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/09/25 09:15:02 $"; +static const char * const IDENT_XNODE_C="$Date: 2004/03/10 10:42:11 $"; #include "pa_vmethod_frame.h" @@ -16,6 +16,7 @@ static const char* IDENT_XNODE_C="$Date: #include "pa_vxnode.h" #include "pa_vxdoc.h" #include "pa_vvoid.h" +#include "pa_xml_exception.h" #include "xnode.h" @@ -25,6 +26,7 @@ extern "C" { }; #include "gdome.h" #include "libxml/xpath.h" +#include "libxml/xpathInternals.h" // global variable @@ -110,7 +112,6 @@ GdomeNode* as_node(MethodParams& params, throw Exception("parser.runtime", 0, msg); - result=0; // calm, compiler } return result; @@ -144,9 +145,9 @@ static void _insertBefore(Request& r, Me GdomeException exc; if(GdomeNode* retNode=gdome_n_insertBefore(selfNode, newChild, refChild, &exc)) { // write out result - r.write_no_lang(*new VXnode(&r.charsets, retNode)); + r.write_no_lang(*new VXnode(&r.charsets, vnode.get_xdoc(), retNode)); } else - throw Exception(0, exc); + throw XmlException(0, exc); } // Node replaceChild(in Node newChild,in Node oldChild) raises(DOMException); @@ -154,14 +155,14 @@ static void _replaceChild(Request& r, Me 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"); + 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 VXnode(&r.charsets, retNode)); + r.write_no_lang(*new VXnode(&r.charsets, vnode.get_xdoc(), retNode)); } else - throw Exception(0, exc); + throw XmlException(0, exc); } // Node removeChild(in Node oldChild) raises(DOMException); @@ -173,9 +174,9 @@ static void _removeChild(Request& r, Met GdomeException exc; if(GdomeNode* retNode=gdome_n_removeChild(selfNode, oldChild, &exc)) { // write out result - r.write_no_lang(*new VXnode(&r.charsets, retNode)); + r.write_no_lang(*new VXnode(&r.charsets, vnode.get_xdoc(), retNode)); } else - throw Exception(0, exc); + throw XmlException(0, exc); } // Node appendChild(in Node newChild) raises(DOMException); @@ -187,9 +188,9 @@ static void _appendChild(Request& r, Met GdomeException exc; if(GdomeNode* retNode=gdome_n_appendChild(selfNode, newChild, &exc)) { // write out result - r.write_no_lang(*new VXnode(&r.charsets, retNode)); + r.write_no_lang(*new VXnode(&r.charsets, vnode.get_xdoc(), retNode)); } else - throw Exception(0, exc); + throw XmlException(0, exc); } // boolean hasChildNodes(); @@ -212,13 +213,12 @@ static void _cloneNode(Request& r, Metho GdomeException exc; // write out result - r.write_no_lang(*new VXnode(&r.charsets, gdome_n_cloneNode(node, deep, &exc))); + 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) { - VXnode& vnode=GET_SELF(r, VXnode); +GdomeElement* get_self_element(VXnode& vnode) { GdomeNode* node=vnode.get_node(); GdomeException exc; @@ -232,9 +232,10 @@ GdomeElement* get_self_element(Request& -// DOMString getAttribute(in DOMString name); +/// @bug attribute_value must be freed! [// DOMString getAttribute(in DOMString name); static void _getAttribute(Request& r, MethodParams& params) { - GdomeElement* element=get_self_element(r); + 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; @@ -246,7 +247,8 @@ static void _getAttribute(Request& r, Me // void setAttribute(in DOMString name, in DOMString value) raises(DOMException); static void _setAttribute(Request& r, MethodParams& params) { - GdomeElement* element=get_self_element(r); + 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"); @@ -256,67 +258,66 @@ static void _setAttribute(Request& r, Me r.transcode(attribute_value).use(), &exc); if(exc) - throw Exception(0, exc); + throw XmlException(0, exc); } // void removeAttribute(in DOMString name) raises(DOMException); static void _removeAttribute(Request& r, MethodParams& params) { - GdomeElement* element=get_self_element(r); + 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, r.transcode(name).use(), &exc); if(exc) - throw Exception(0, exc); + throw XmlException(0, exc); } // Attr getAttributeNode(in DOMString name); static void _getAttributeNode(Request& r, MethodParams& params) { - GdomeElement* element=get_self_element(r); + 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, r.transcode(name).use(), &exc)) { // write out result - r.write_no_lang(*new VXnode(&r.charsets, (GdomeNode* )attr)); + r.write_no_lang(*new VXnode(&r.charsets, vnode.get_xdoc(), (GdomeNode* )attr)); } else if(exc) - throw Exception( - 0, - exc); + throw XmlException(0, exc); } // Attr setAttributeNode(in Attr newAttr) raises(DOMException); static void _setAttributeNode(Request& r, MethodParams& params) { - GdomeElement* element=get_self_element(r); + 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 - r.write_no_lang(*new VXnode(&r.charsets, (GdomeNode* )returnAttr)); + r.write_no_lang(*new VXnode(&r.charsets, vnode.get_xdoc(), (GdomeNode* )returnAttr)); } else - throw Exception( - 0, - exc); + throw XmlException(0, exc); } // Attr removeAttributeNode(in Attr oldAttr) raises(DOMException); static void _removeAttributeNode(Request& r, MethodParams& params) { - GdomeElement* element=get_self_element(r); + 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, - exc); + throw XmlException(0, exc); } // NodeList getElementsByTagName(in DOMString name); static void _getElementsByTagName(Request& r, MethodParams& params) { - GdomeElement* element=get_self_element(r); + VXnode& vnode=GET_SELF(r, VXnode); + GdomeElement* element=get_self_element(vnode); const String& name=params.as_string(0, "name must be string"); @@ -328,11 +329,9 @@ static void _getElementsByTagName(Reques for(gulong i=0; iget_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, + VXdoc& xdoc, Value*& result)) { VXnode& vnode=GET_SELF(r, VXnode); // expression const String& expression=params.as_string(0, "expression must be string"); - GdomeException exc; GdomeNode* dome_node=vnode.get_node(); GdomeDocument *dome_document=gdome_n_ownerDocument(dome_node, &exc); @@ -506,6 +526,10 @@ static void _selectX(Request& r, MethodP 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)); + { + 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( @@ -513,12 +537,12 @@ static void _selectX(Request& r, MethodP if(xmlHaveGenericErrors()) { GdomeException exc=0; - throw Exception(&expression, exc); + throw XmlException(&expression, exc); } Value* result=0; if(res.get()) - handler(r, expression, res, result); + handler(r, expression, res, vnode.get_xdoc(), result); if(result) r.write_no_lang(*result); } @@ -526,6 +550,7 @@ static void _selectX(Request& r, MethodP 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) { @@ -540,6 +565,7 @@ static void selectNodesHandler(Request& String::Body::Format(i), new VXnode( &r.charsets, + xdoc, gdome_xml_n_mkref(res->nodesetval->nodeTab[i]))); } break; @@ -553,8 +579,9 @@ static void selectNodesHandler(Request& static void selectNodeHandler(Request& r, const String& expression, - xmlXPathObject_auto_ptr res, - Value*& result) { + xmlXPathObject_auto_ptr res, + VXdoc& xdoc, + Value*& result) { switch(res->type) { case XPATH_UNDEFINED: break; @@ -567,6 +594,7 @@ static void selectNodeHandler(Request& r result=new VXnode( &r.charsets, + xdoc, gdome_xml_n_mkref(res->nodesetval->nodeTab[0])); } break; @@ -588,9 +616,10 @@ static void selectNodeHandler(Request& r } } -static void selectBoolHandler(Request& r, +static void selectBoolHandler(Request&, const String& expression, xmlXPathObject_auto_ptr res, + VXdoc& /*xdoc*/, Value*& result) { switch(res->type) { case XPATH_BOOLEAN: @@ -608,9 +637,10 @@ static void selectBoolHandler(Request& r } } -static void selectNumberHandler(Request& r, +static void selectNumberHandler(Request&, const String& expression, xmlXPathObject_auto_ptr res, + VXdoc& /*xdoc*/, Value*& result) { switch(res->type) { case XPATH_NUMBER: @@ -631,6 +661,7 @@ static void selectNumberHandler(Request& static void selectStringHandler(Request& r, const String& expression, xmlXPathObject_auto_ptr res, + VXdoc& /*xdoc*/, Value*& result) { switch(res->type) { case XPATH_UNDEFINED: