--- parser3/src/classes/xnode.C 2002/08/01 11:41:13 1.47 +++ parser3/src/classes/xnode.C 2003/04/11 09:58:10 1.55 @@ -1,13 +1,13 @@ /** @file Parser: @b dom parser class. - Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001, 2003 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: 2002/08/01 11:41:13 $"; +static const char* IDENT_XNODE_C="$Date: 2003/04/11 09:58:10 $"; #include "pa_charset.h" #include "pa_request.h" @@ -97,14 +97,12 @@ private: GdomeNode *as_node(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)) + if(Value *vxnode=value.as(VXNODE_TYPE, false)) + return static_cast(vxnode)->get_node(&method_name); + else throw Exception("parser.runtime", &method_name, msg); - - VXnode& vnode=*static_cast(&value); - return vnode.get_node(&method_name); } // helpers @@ -128,7 +126,7 @@ GdomeAttr * as_attr(Pool& pool, const St // 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); + VXnode& vnode=*static_cast(r.get_self()); GdomeNode *selfNode=vnode.get_node(&method_name); GdomeNode *newChild=as_node(method_name, params, 0, "newChild must be node"); GdomeNode *refChild=as_node(method_name, params, 1, "refChild must be node"); @@ -147,7 +145,7 @@ static void _insertBefore(Request& r, co // 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); + VXnode& vnode=*static_cast(r.get_self()); GdomeNode *selfNode=vnode.get_node(&method_name); GdomeNode *newChild=as_node(method_name, params, 0, "newChild must be node"); GdomeNode *refChild=as_node(method_name, params, 1, "refChild must be node"); @@ -165,7 +163,7 @@ static void _replaceChild(Request& r, co // 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); + VXnode& vnode=*static_cast(r.get_self()); GdomeNode *selfNode=vnode.get_node(&method_name); GdomeNode *oldChild=as_node(method_name, params, 0, "oldChild must be node"); @@ -182,7 +180,7 @@ static void _removeChild(Request& r, con // 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); + VXnode& vnode=*static_cast(r.get_self()); GdomeNode *selfNode=vnode.get_node(&method_name); GdomeNode *newChild=as_node(method_name, params, 0, "newChild must be node"); @@ -199,7 +197,7 @@ static void _appendChild(Request& r, con // boolean hasChildNodes(); static void _hasChildNodes(Request& r, const String& method_name, MethodParams *) { Pool& pool=r.pool(); - VXnode& vnode=*static_cast(r.self); + VXnode& vnode=*static_cast(r.get_self()); GdomeNode *node=vnode.get_node(&method_name); GdomeException exc; @@ -211,7 +209,7 @@ static void _hasChildNodes(Request& r, c // 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); + VXnode& vnode=*static_cast(r.get_self()); GdomeNode *node=vnode.get_node(&method_name); bool deep=params->as_bool(0, "deep must be bool", r); @@ -225,14 +223,14 @@ static void _cloneNode(Request& r, const GdomeElement *get_self_element(Request& r, const String& method_name) { Pool& pool=r.pool(); - VXnode& vnode=*static_cast(r.self); + VXnode& vnode=*static_cast(r.get_self()); GdomeNode *node=vnode.get_node(&method_name); GdomeException exc; if(gdome_n_nodeType(node, &exc)!=GDOME_ELEMENT_NODE) throw Exception("parser.runtime", &method_name, - "method can be called on node of ELEMENT type"); + "method can only be called on nodes of ELEMENT type"); return GDOME_EL(node); } @@ -245,9 +243,9 @@ static void _getAttribute(Request& r, co GdomeException exc; GdomeDOMString *attribute_value= - gdome_el_getAttribute(element, pool.transcode(name).get(), &exc); + gdome_el_getAttribute(element, pool.transcode(name).use(), &exc); // write out result - r.write_no_lang(pool.transcode(attribute_value)); + r.write_no_lang(pool.transcode(attribute_value, &name)); } // void setAttribute(in DOMString name, in DOMString value) raises(DOMException); @@ -259,8 +257,8 @@ static void _setAttribute(Request& r, co GdomeException exc; gdome_el_setAttribute(element, - pool.transcode(name).get(), - pool.transcode(attribute_value).get(), + pool.transcode(name).use(), + pool.transcode(attribute_value).use(), &exc); if(exc) throw Exception( @@ -275,7 +273,7 @@ static void _removeAttribute(Request& r, 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, pool.transcode(name).use(), &exc); if(exc) throw Exception( &method_name, @@ -289,7 +287,7 @@ static void _getAttributeNode(Request& r 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, pool.transcode(name).use(), &exc)) { // write out result VXnode& result=*new(pool) VXnode(pool, (GdomeNode *)attr); r.write_no_lang(result); @@ -340,7 +338,7 @@ static void _getElementsByTagName(Reques VHash& result=*new(pool) VHash(pool); GdomeException exc; if(GdomeNodeList *nodes= - gdome_el_getElementsByTagName(element, pool.transcode(name).get(), &exc)) { + gdome_el_getElementsByTagName(element, pool.transcode(name).use(), &exc)) { gulong length=gdome_nl_length(nodes, &exc); for(gulong i=0; i(r.self); + VXnode& vnode=*static_cast(r.get_self()); GdomeNode *selfNode=vnode.get_node(&method_name); GdomeException exc; @@ -415,7 +413,7 @@ static void _selectX(Request& r, const S Value *& result)) { // _asm int 3; Pool& pool=r.pool(); - VXnode& vnode=*static_cast(r.self); + VXnode& vnode=*static_cast(r.get_self()); // expression const String& expression=params->as_string(0, "expression must be string"); @@ -504,7 +502,7 @@ static void selectNodeHandler(Pool& pool result=new(pool) VString( pool.transcode( GdomeDOMString_auto_ptr( - gdome_str_mkref_dup((const gchar *)res->stringval)).get())); + gdome_str_mkref_dup((const gchar *)res->stringval)).use(), &expression)); break; default: throw Exception("parser.runtime", @@ -565,7 +563,7 @@ static void selectStringHandler(Pool& po result=new(pool) VString( pool.transcode( GdomeDOMString_auto_ptr( - gdome_str_mkref_dup((const gchar *)res->stringval)).get())); + gdome_str_mkref_dup((const gchar *)res->stringval)).use(), &expression)); break; case XPATH_NODESET: if(!(res->nodesetval && res->nodesetval->nodeNr))