--- parser3/src/classes/xnode.C 2001/12/28 14:06:50 1.19 +++ parser3/src/classes/xnode.C 2002/01/28 10:50:03 1.35 @@ -4,28 +4,105 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://paf.design.ru) - $Id: xnode.C,v 1.19 2001/12/28 14:06:50 paf Exp $ + $Id: xnode.C,v 1.35 2002/01/28 10:50:03 paf Exp $ */ #include "classes.h" #ifdef XML +#include "pa_charset.h" #include "pa_request.h" #include "pa_vxnode.h" +#include "pa_vxdoc.h" +#include "pa_vvoid.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" -// defines +// defines #define XNODE_CLASS_NAME "xnode" +// classes + +class xmlXPathObject_auto_ptr { +public: + 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) + {if (this != &_Y) + {if (_Ptr != _Y.get()) + {if (_Owns && _Ptr) + xmlXPathFreeObject(_Ptr); + _Owns = _Y._Owns; } + else if (_Y._Owns) + _Owns = true; + _Ptr = _Y.release(); } + return (*this); } + ~xmlXPathObject_auto_ptr() + {if (_Owns && _Ptr) + xmlXPathFreeObject(_Ptr); } + xmlXPathObject& operator*() const + {return (*get()); } + xmlXPathObject *operator->() const + {return (get()); } + xmlXPathObject *get() const + {return (_Ptr); } + xmlXPathObject *release() const + {((xmlXPathObject_auto_ptr *)this)->_Owns = false; + return (_Ptr); } +private: + bool _Owns; + xmlXPathObject *_Ptr; +}; + +class xmlXPathContext_auto_ptr { +public: + 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) + {if (this != &_Y) + {if (_Ptr != _Y.get()) + {if (_Owns && _Ptr) + xmlXPathFreeContext(_Ptr); + _Owns = _Y._Owns; } + else if (_Y._Owns) + _Owns = true; + _Ptr = _Y.release(); } + return (*this); } + ~xmlXPathContext_auto_ptr() + {if (_Owns && _Ptr) + xmlXPathFreeContext(_Ptr); } + xmlXPathContext& operator*() const + {return (*get()); } + xmlXPathContext *operator->() const + {return (get()); } + xmlXPathContext *get() const + {return (_Ptr); } + xmlXPathContext *release() const + {((xmlXPathContext_auto_ptr *)this)->_Owns = false; + return (_Ptr); } +private: + bool _Owns; + xmlXPathContext *_Ptr; +}; + // helpers 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) + if(strcmp(value.type(), VXNODE_TYPE)!=0 + || strcmp(value.type(), VXDOC_TYPE)!=0) throw Exception(0, 0, &method_name, msg); @@ -137,7 +214,6 @@ static void _hasChildNodes(Request& r, c } // 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); @@ -176,7 +252,7 @@ static void _getAttribute(Request& r, co GdomeException exc; GdomeDOMString *attribute_value= - gdome_el_getAttribute(element, pool.transcode(name), &exc); + gdome_el_getAttribute(element, pool.transcode(name).get(), &exc); // write out result r.write_no_lang(*new(pool) VString(pool.transcode(attribute_value))); } @@ -190,8 +266,8 @@ static void _setAttribute(Request& r, co GdomeException exc; gdome_el_setAttribute(element, - pool.transcode(name), - pool.transcode(attribute_value), + pool.transcode(name).get(), + pool.transcode(attribute_value).get(), &exc); if(exc) throw Exception(0, 0, @@ -206,7 +282,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), &exc); + gdome_el_removeAttribute(element, pool.transcode(name).get(), &exc); if(exc) throw Exception(0, 0, &method_name, @@ -220,7 +296,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), &exc)) { + if(GdomeAttr *attr=gdome_el_getAttributeNode(element, pool.transcode(name).get(), &exc)) { // write out result VXnode& result=*new(pool) VXnode(pool, (GdomeNode *)attr); r.write_no_lang(result); @@ -257,8 +333,8 @@ static void _removeAttributeNode(Request gdome_el_removeAttributeNode(element, oldAttr, &exc); if(exc) throw Exception(0, 0, - &method_name, - exc); + &method_name, + exc); } // NodeList getElementsByTagName(in DOMString name); @@ -271,7 +347,7 @@ static void _getElementsByTagName(Reques VHash& result=*new(pool) VHash(pool); GdomeException exc; if(GdomeNodeList *nodes= - gdome_el_getElementsByTagName(element, pool.transcode(name), &exc)) { + gdome_el_getElementsByTagName(element, pool.transcode(name).get(), &exc)) { gulong length=gdome_nl_length(nodes, &exc); for(gulong i=0; i(r.self); // expression const String& expression=params->as_string(0, "expression must be string"); - const char *expression_cstr=expression.cstr(); - XalanDOMString dstring(expression_cstr); - const XalanDOMChar *expression_dcstr=dstring.c_str(); - - XPathEvaluator evaluator; - // We'll use these to parse the XML file. - XalanSourceTreeDOMSupport dom_support; - - try { - NodeRefList list=evaluator.selectNodeList(dom_support, - &vnode.get_node(&method_name), - expression_dcstr); - VHash& result=*new(pool) VHash(pool); - for(int i=0; inode=gdome_xml_n_get_xmlNode(dome_node); + /*error to stderr for now*/ + xmlXPathObject_auto_ptr res( + xmlXPathEvalExpression(BAD_CAST pool.transcode(expression)->str, ctxt.get())); + + if(xmlHaveGenericErrors()) { + GdomeException exc=0; + throw Exception(0, 0, + &expression, + exc); + } + + Value *result=0; + if(res.get()) + handler(pool, expression, res, result); + if(result) { + result->set_name(method_name); + r.write_no_lang(*result); + } +} + +static void selectNodesHandler(Pool& pool, + const String& expression, + xmlXPathObject_auto_ptr res, + Value *& result) { + VHash *vhash=new(pool) VHash(pool); result=vhash; + switch(res->type) { + case XPATH_UNDEFINED: + break; + case XPATH_NODESET: + if(int size=res->nodesetval->nodeNr) { + Hash& hash=vhash->hash(0); + for(int i=0; inodesetval->nodeTab[i]))); } + } + break; + default: + throw Exception(0, 0, + &expression, + "wrong xmlXPathEvalExpression result type (%d)", res->type); + break; // never + } +} - result.hash(0).put(skey, new(pool) VXnode(pool, list.item(i), false)); +static void selectNodeHandler(Pool& pool, + const String& expression, + xmlXPathObject_auto_ptr res, + 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->nodeNr>1) + throw Exception(0, 0, + &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.set_name(method_name); - r.write_no_lang(result); - } catch(const XSLException& e) { - Exception::provide_source(pool, &expression, e); + break; + case XPATH_BOOLEAN: + result=new(pool) VBool(pool, res->boolval!=0); + break; + case XPATH_NUMBER: + result=new(pool) VDouble(pool, res->floatval); + break; + case XPATH_STRING: + result=new(pool) VString( + pool.transcode( + GdomeDOMString_auto_ptr( + gdome_str_mkref_dup((const gchar *)res->stringval)).get())); + break; + default: + throw Exception(0, 0, + &expression, + "wrong xmlXPathEvalExpression result type (%d)", res->type); + break; // never } } -static void _selectSingle(Request& r, const String& method_name, MethodParams *params) { -// _asm int 3; - Pool& pool=r.pool(); - VXnode& vnode=*static_cast(r.self); +static void selectBoolHandler(Pool& pool, + const String& expression, + xmlXPathObject_auto_ptr res, + Value *& result) { + switch(res->type) { + case XPATH_BOOLEAN: + result=new(pool) VBool(pool, res->boolval!=0); + break; + case XPATH_NODESET: + if(!res->nodesetval->nodeNr) + break; + // else[nodeset] fall down to default + default: + throw Exception(0, 0, + &expression, + "wrong xmlXPathEvalExpression result type (%d)", res->type); + break; // never + } +} - // expression - const String& expression=params->as_string(0, "expression must be string"); - const char *expression_cstr=expression.cstr(); - XalanDOMString dstring(expression_cstr); - const XalanDOMChar *expression_dcstr=dstring.c_str(); - - XPathEvaluator evaluator; - // Initialize the XalanSourceTree subsystem... -// XalanSourceTreeInit theSourceTreeInit; - // We'll use these to parse the XML file. - XalanSourceTreeDOMSupport dom_support; - - try { - if(GdomeNode *node=evaluator.selectSingleNode(dom_support, - &vnode.get_node(&method_name), - expression_dcstr)) { - - VXnode& result=*new(pool) VXnode(pool, node, false); - result.set_name(method_name); - r.write_no_lang(result); - } - } catch(const XSLException& e) { - Exception::provide_source(pool, &expression, e); +static void selectNumberHandler(Pool& pool, + const String& expression, + xmlXPathObject_auto_ptr res, + Value *& result) { + switch(res->type) { + case XPATH_NUMBER: + result=new(pool) VDouble(pool, res->floatval); + break; + case XPATH_NODESET: + if(!res->nodesetval->nodeNr) + break; + // else[nodeset] fall down to default + default: + throw Exception(0, 0, + &expression, + "wrong xmlXPathEvalExpression result type (%d)", res->type); + break; // never } } -*/ + +static void selectStringHandler(Pool& pool, + const String& expression, + xmlXPathObject_auto_ptr res, + 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())); + break; + case XPATH_NODESET: + if(!res->nodesetval->nodeNr) + break; + // else[nodeset] fall down to default + default: + throw Exception(0, 0, + &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, + selectNodesHandler); +} + +static void _selectSingle(Request& r, const String& method_name, MethodParams *params) { + _selectX(r, method_name, params, + selectNodeHandler); +} + +static void _selectBool(Request& r, const String& method_name, MethodParams *params) { + _selectX(r, method_name, params, + selectBoolHandler); +} + +static void _selectNumber(Request& r, const String& method_name, MethodParams *params) { + _selectX(r, method_name, params, + selectNumberHandler); +} + +static void _selectString(Request& r, const String& method_name, MethodParams *params) { + _selectX(r, method_name, params, + selectStringHandler); +} + // constructor MXnode::MXnode(Pool& apool) : Methoded(apool), @@ -418,13 +622,18 @@ MXnode::MXnode(Pool& apool) : Methoded(a add_native_method("normalize", Method::CT_DYNAMIC, _normalize, 0, 0); /// parser -/* // ^node.select[/some/xpath/query] = hash $.#[dnode] add_native_method("select", Method::CT_DYNAMIC, _select, 1, 1); - // ^node.selectSingle[/some/xpath/query] = first dnode + // ^node.selectSingle[/some/xpath/query] = first node [if any] add_native_method("selectSingle", Method::CT_DYNAMIC, _selectSingle, 1, 1); -*/ + // ^node.selectBool[/some/xpath/query] = bool value [if any] + add_native_method("selectBool", Method::CT_DYNAMIC, _selectBool, 1, 1); + // ^node.selectNumber[/some/xpath/query] = double value [if any] + add_native_method("selectNumber", Method::CT_DYNAMIC, _selectNumber, 1, 1); + // ^node.selectString[/some/xpath/query] = strinv value [if any] + add_native_method("selectString", Method::CT_DYNAMIC, _selectString, 1, 1); + // consts #define CONST(name) \