--- parser3/src/classes/xnode.C 2007/08/20 08:56:46 1.78 +++ 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: 2007/08/20 08:56:46 $"; +static const char * const IDENT_XNODE_C="$Date: 2009/04/16 01:10:22 $"; #include "pa_vmethod_frame.h" @@ -167,7 +167,7 @@ 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) @@ -330,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); @@ -365,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)); @@ -377,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); } @@ -389,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); } @@ -400,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 @@ -460,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}; @@ -481,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); @@ -497,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); @@ -528,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); } @@ -541,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 @@ -555,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); @@ -568,12 +566,11 @@ 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 @@ -582,7 +579,7 @@ static void _hasAttributes(Request& r, M xmlNode& element=get_self_element(vnode); // write out result - r.write_no_lang(*new VBool(element.properties!=0)); + r.write_no_lang(VBool::get(element.properties!=0)); } static void _getElementsByTagNameNS(Request& r, MethodParams& params) { @@ -591,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}; @@ -708,7 +705,7 @@ 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, &expression, @@ -718,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); @@ -740,7 +737,7 @@ 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))