--- parser3/src/classes/xnode.C 2005/12/16 15:08:46 1.73 +++ parser3/src/classes/xnode.C 2009/04/16 01:10:22 1.83 @@ -1,13 +1,13 @@ /** @file Parser: @b dom parser class. - Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2009 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/12/16 15:08:46 $"; +static const char * const IDENT_XNODE_C="$Date: 2009/04/16 01:10:22 $"; #include "pa_vmethod_frame.h" @@ -17,6 +17,7 @@ static const char * const IDENT_XNODE_C= #include "pa_vxdoc.h" #include "pa_vvoid.h" #include "pa_xml_exception.h" +#include "pa_vbool.h" #include "xnode.h" #include "libxml/xpath.h" @@ -101,7 +102,7 @@ xmlNode& as_node(MethodParams& params, i if(Value* vxnode=value.as(VXNODE_TYPE, false)) return static_cast(vxnode)->get_xmlnode(); else - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, msg); } @@ -113,7 +114,7 @@ xmlChar* as_xmlchar(Request& r, MethodPa 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", + throw Exception(PARSER_RUNTIME, 0, msg); @@ -166,11 +167,11 @@ xmlNs& pa_xmlMapNs(xmlDoc& doc, const xm return *cur; } -/// todo: проверить, обновляется ли parent! +/// @todo: проверить, обновляется ли parent! static void pa_addAttributeNode(xmlNode& selfNode, xmlAttr& attrNode) { if(attrNode.type!=XML_ATTRIBUTE_NODE) - throw Exception("xml", + throw Exception(PARSER_RUNTIME, 0, "must be ATTRIBUTE_NODE"); @@ -265,17 +266,22 @@ static void _replaceChild(Request& r, Me 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, "refChild must be node"); + xmlNode& oldChild=as_node(params, 1, "oldChild must be node"); if(newChild.doc!=&xmldoc) - throw Exception("xml", + throw Exception("xml.dom", 0, "WRONG_DOCUMENT_ERR"); if(oldChild.doc!=&xmldoc) - throw Exception("xml", + 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; @@ -297,7 +303,7 @@ static void _removeChild(Request& r, Met xmlNode& oldChild=as_node(params, 0, "refChild must be node"); if(oldChild.doc!=&xmldoc) - throw Exception("xml", + throw Exception("xml.dom", 0, "WRONG_DOCUMENT_ERR"); @@ -324,8 +330,7 @@ static void _hasChildNodes(Request& r, M xmlNode& node=vnode.get_xmlnode(); // write out result - bool result=node.children!=0; - r.write_no_lang(*new VBool(result)); + r.write_no_lang(VBool::get(node.children!=0)); } // Node cloneNode(in boolean deep); @@ -348,7 +353,7 @@ xmlNode& get_self_element(VXnode& vnode) xmlNode& node=vnode.get_xmlnode(); if(node.type!=XML_ELEMENT_NODE) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "method can only be called on nodes of ELEMENT type"); @@ -359,9 +364,9 @@ xmlNode& get_self_element(VXnode& vnode) 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"); + const xmlChar* name=as_xmlchar(r, params, 0, NAME_MUST_BE_STRING); - // todo: when name="xmlns" + // @todo: when name="xmlns" xmlChar* attribute_value=xmlGetProp(&element, name); // write out result r.write_pass_lang(r.transcode(attribute_value)); @@ -371,10 +376,10 @@ static void _getAttribute(Request& r, Me 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"); + 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" + // @todo: when name="xmlns" if(!xmlSetProp(&element, name, attribute_value)) throw XmlException(0); } @@ -383,9 +388,9 @@ static void _setAttribute(Request& r, Me 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"); + const xmlChar* name=as_xmlchar(r, params, 0, NAME_MUST_BE_STRING); - // todo: when name="xmlns" + // @todo: when name="xmlns" xmlUnsetProp(&element, name); } @@ -394,7 +399,7 @@ static void _getAttributeNode(Request& r 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"); + const xmlChar* localName=as_xmlchar(r, params, 0, NAME_MUST_BE_STRING); if(xmlNode* retNode=pa_getAttributeNodeNS(element, localName, 0)){ // write out result @@ -412,12 +417,12 @@ static void _setAttributeNode(Request& r xmlAttr& newAttr=as_attr(params, 0, "newAttr must be ATTRIBUTE node"); if(newAttr.doc!=&xmldoc) - throw Exception("xml", + throw Exception("xml.dom", 0, "WRONG_DOCUMENT_ERR"); if(newAttr.parent) - throw Exception("xml", + throw Exception("xml.dom", 0, "INUSE_ATTRIBUTE_ERR"); @@ -438,7 +443,7 @@ static void _removeAttributeNode(Request xmlAttr& oldAttr=as_attr(params, 0, "oldAttr must be ATTRIBUTE node"); if(oldAttr.parent!=&element) - throw Exception("xml", + throw Exception("xml.dom", 0, "NOT_FOUND_ERR"); @@ -454,7 +459,7 @@ static void _getElementsByTagName(Reques VXdoc& vxdoc=vnode.get_vxdoc(); xmlNode& xmlnode=vnode.get_xmlnode(); - xmlChar* tagName=as_xmlchar(r, params, 0, "name must be string"); + xmlChar* tagName=as_xmlchar(r, params, 0, NAME_MUST_BE_STRING); VHash& result=*new VHash; AccumulateFoundInfo info={&result.hash(), &vxdoc, 0}; @@ -475,8 +480,8 @@ static void _getAttributeNS(Request& r, VXnode& vnode=GET_SELF(r, VXnode); xmlNode& element=get_self_element(vnode); - xmlChar* namespaceURI=as_xmlchar(r, params, 0, "namespaceURI must be string"); - xmlChar* localName=as_xmlchar(r, params, 1, "localName must be string"); + xmlChar* namespaceURI=as_xmlchar(r, params, 0, NAMESPACEURI_MUST_BE_STRING); + xmlChar* localName=as_xmlchar(r, params, 1, LOCALNAME_MUST_BE_STRING); // todo: when name="xmlns" xmlChar* attribute_value=xmlGetNsProp(&element, localName, namespaceURI); @@ -491,14 +496,14 @@ static void _setAttributeNS(Request& r, xmlNode& element=get_self_element(vnode); VXdoc& vxdoc=vnode.get_vxdoc(); xmlDoc& xmldoc=vxdoc.get_xmldoc(); - const xmlChar* namespaceURI=as_xmlchar(r, params, 0, "namespaceURI must be string"); + const xmlChar* namespaceURI=as_xmlchar(r, params, 0, NAMESPACEURI_MUST_BE_STRING); const xmlChar* qualifiedName=as_xmlchar(r, params, 1, "qualifiedName must be string"); - const xmlChar* attribute_value=as_xmlchar(r, params, 2, "value must be string"); + const xmlChar* attribute_value=as_xmlchar(r, params, 2, VALUE_MUST_BE_STRING); xmlChar* prefix=0; xmlChar* localName=xmlSplitQName2(qualifiedName, &prefix); - // todo: name=xmlns + // @todo: name=xmlns xmlAttr* attrNode; if(localName) { xmlNs& ns=pa_xmlMapNs(xmldoc, namespaceURI, prefix); @@ -522,10 +527,10 @@ static void _removeAttributeNS(Request& xmlNode& element=get_self_element(vnode); VXdoc& vxdoc=vnode.get_vxdoc(); xmlDoc& xmldoc=vxdoc.get_xmldoc(); - const xmlChar* namespaceURI=as_xmlchar(r, params, 0, "namespaceURI must be string"); - const xmlChar* localName=as_xmlchar(r, params, 1, "localName must be string"); + const xmlChar* namespaceURI=as_xmlchar(r, params, 0, NAMESPACEURI_MUST_BE_STRING); + const xmlChar* localName=as_xmlchar(r, params, 1, LOCALNAME_MUST_BE_STRING); - // todo: when name="xmlns" + // @todo: when name="xmlns" xmlNs& ns=pa_xmlMapNs(xmldoc, namespaceURI, 0); xmlUnsetNsProp(&element, &ns, localName); } @@ -535,8 +540,8 @@ static void _getAttributeNodeNS(Request& VXnode& vnode=GET_SELF(r, VXnode); VXdoc& vxdoc=vnode.get_vxdoc(); xmlNode& element=get_self_element(vnode); - const xmlChar* namespaceURI=as_xmlchar(r, params, 0, "namespaceURI must be string"); - const xmlChar* localName=as_xmlchar(r, params, 1, "localName must be string"); + const xmlChar* namespaceURI=as_xmlchar(r, params, 0, NAMESPACEURI_MUST_BE_STRING); + const xmlChar* localName=as_xmlchar(r, params, 1, LOCALNAME_MUST_BE_STRING); if(xmlNode* retNode=pa_getAttributeNodeNS(element, localName, namespaceURI)){ // write out result @@ -549,12 +554,11 @@ static void _hasAttribute(Request& r, Me 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* name=as_xmlchar(r, params, 0, NAME_MUST_BE_STRING); - xmlChar* prop=xmlGetProp(&element, name); - // todo: when name="xmlns" + // @todo: when name="xmlns" // write out result - r.write_no_lang(*new VBool(prop!=0)); + r.write_no_lang(VBool::get(xmlHasProp(&element, name)!=0)); } // boolean hasAttributeNS(n DOMString namespaceURI, in DOMString localName) raises(DOMException); @@ -562,12 +566,20 @@ static void _hasAttributeNS(Request& r, VXnode& vnode=GET_SELF(r, VXnode); xmlNode& element=get_self_element(vnode); - const xmlChar* namespaceURI=as_xmlchar(r, params, 0, "namespaceURI must be string"); - const xmlChar* localName=as_xmlchar(r, params, 1, "localName must be string"); + const xmlChar* namespaceURI=as_xmlchar(r, params, 0, NAMESPACEURI_MUST_BE_STRING); + const xmlChar* localName=as_xmlchar(r, params, 1, LOCALNAME_MUST_BE_STRING); - xmlChar* prop=xmlGetNsProp(&element, localName, namespaceURI); // write out result - r.write_no_lang(*new VBool(prop!=0)); + r.write_no_lang(VBool::get(xmlHasNsProp(&element, localName, namespaceURI)!=0)); +} + +// boolean hasAttributes +static void _hasAttributes(Request& r, MethodParams&) { + VXnode& vnode=GET_SELF(r, VXnode); + xmlNode& element=get_self_element(vnode); + + // write out result + r.write_no_lang(VBool::get(element.properties!=0)); } static void _getElementsByTagNameNS(Request& r, MethodParams& params) { @@ -576,8 +588,8 @@ static void _getElementsByTagNameNS(Requ xmlDoc& xmldoc=vdoc.get_xmldoc(); // namespaceURI;localName - xmlChar* namespaceURI=as_xmlchar(r, params, 0, "namespaceURI must be string"); - xmlChar* localName=as_xmlchar(r, params, 1, "name must be string"); + xmlChar* namespaceURI=as_xmlchar(r, params, 0, NAMESPACEURI_MUST_BE_STRING); + xmlChar* localName=as_xmlchar(r, params, 1, NAME_MUST_BE_STRING); VHash& result=*new VHash; AccumulateFoundInfo info={&result.hash(), &vdoc, 0}; @@ -619,7 +631,7 @@ static void register_one_ns( info->r->transcode(key), info->r->transcode(*svalue)); else - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, new String(key, String::L_TAINTED), "value is %s, must be string or number", value->type()); } @@ -631,7 +643,7 @@ static void _selectX(Request& r, MethodP Value*& result)) { VXnode& vnode=GET_SELF(r, VXnode); - xmlNode& element=get_self_element(vnode); + xmlNode& xmlnode=vnode.get_xmlnode(); VXdoc& vdoc=vnode.get_vxdoc(); xmlDoc& xmldoc=vdoc.get_xmldoc(); @@ -640,9 +652,9 @@ static void _selectX(Request& r, MethodP xmlXPathContext_auto_ptr ctxt(xmlXPathNewContext(&xmldoc)); { Register_one_ns_info info={&r, ctxt.get()}; - vdoc.search_namespaces.hash().for_each(register_one_ns, &info); + vdoc.search_namespaces.hash().for_each(register_one_ns, &info); } - ctxt->node=&element; + ctxt->node=&xmlnode; /*error to stderr for now*/ xmlXPathObject_auto_ptr res( xmlXPathEvalExpression(r.transcode(expression), ctxt.get())); @@ -677,7 +689,7 @@ static void selectNodesHandler(Request&, } break; default: - throw Exception(0, + throw Exception(PARSER_RUNTIME, &expression, "wrong xmlXPathEvalExpression result type (%d)", res->type); break; // never @@ -693,9 +705,9 @@ static void selectNodeHandler(Request& r case XPATH_UNDEFINED: break; case XPATH_NODESET: - if(res->nodesetval && res->nodesetval->nodeNr) { // empty result strangly has NODESET res->type + if(res->nodesetval && res->nodesetval->nodeNr) { // empty result strangely has NODESET res->type if(res->nodesetval->nodeNr>1) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, &expression, "resulted not in a single node (%d)", res->nodesetval->nodeNr); @@ -703,7 +715,7 @@ static void selectNodeHandler(Request& r } break; case XPATH_BOOLEAN: - result=new VBool(res->boolval!=0); + result=&VBool::get(res->boolval!=0); break; case XPATH_NUMBER: result=new VDouble(res->floatval); @@ -712,7 +724,7 @@ static void selectNodeHandler(Request& r result=new VString(r.transcode((xmlChar*)res->stringval)); break; default: - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, &expression, "wrong xmlXPathEvalExpression result type (%d)", res->type); } @@ -725,14 +737,14 @@ static void selectBoolHandler(Request&, Value*& result) { switch(res->type) { case XPATH_BOOLEAN: - result=new VBool(res->boolval!=0); + result=&VBool::get(res->boolval!=0); break; case XPATH_NODESET: if(!(res->nodesetval && res->nodesetval->nodeNr)) break; // else[nodeset] fall down to default default: - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, &expression, "wrong xmlXPathEvalExpression result type (%d)", res->type); break; // never @@ -753,7 +765,7 @@ static void selectNumberHandler(Request& break; // else[nodeset] fall down to default default: - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, &expression, "wrong xmlXPathEvalExpression result type (%d)", res->type); break; // never @@ -776,7 +788,7 @@ static void selectStringHandler(Request& break; // else[nodeset] fall down to default default: - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, &expression, "wrong xmlXPathEvalExpression result type (%d)", res->type); break; // never @@ -866,6 +878,9 @@ MXnode::MXnode(const char* aname, VState 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]