--- parser3/src/classes/xnode.C 2002/01/11 12:24:27 1.22 +++ parser3/src/classes/xnode.C 2002/01/28 10:50:03 1.35 @@ -4,7 +4,7 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://paf.design.ru) - $Id: xnode.C,v 1.22 2002/01/11 12:24:27 paf Exp $ + $Id: xnode.C,v 1.35 2002/01/28 10:50:03 paf Exp $ */ #include "classes.h" #ifdef XML @@ -12,22 +12,28 @@ #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 + +#define XNODE_CLASS_NAME "xnode" + // classes class xmlXPathObject_auto_ptr { public: - explicit xmlXPathObject_auto_ptr(xmlXPathObject *_P = 0) - : _Owns(_P != 0), _Ptr(_P) {} + 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) @@ -59,8 +65,8 @@ private: class xmlXPathContext_auto_ptr { public: - explicit xmlXPathContext_auto_ptr(xmlXPathContext *_P = 0) - : _Owns(_P != 0), _Ptr(_P) {} + 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) @@ -90,16 +96,13 @@ private: xmlXPathContext *_Ptr; }; -// defines - -#define XNODE_CLASS_NAME "xnode" - // 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); @@ -211,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); @@ -331,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); @@ -359,8 +361,8 @@ static void _getElementsByTagName(Reques } } else if(exc) throw Exception(0, 0, - &method_name, - exc); + &method_name, + exc); // write out result r.write_no_lang(result); @@ -376,49 +378,15 @@ static void _normalize(Request& r, const gdome_n_normalize(selfNode, &exc); if(exc) throw Exception(0, 0, - &method_name, - exc); + &method_name, + exc); } -/* -static void _select(Request& r, const String& method_name, MethodParams *params) { -// _asm int 3; - Pool& pool=r.pool(); - VXnode& vnode=*static_cast(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; i(r.self); @@ -429,41 +397,188 @@ static void _selectSingle(Request& r, co GdomeException exc; GdomeNode *dome_node=vnode.get_node(&method_name); GdomeDocument *dome_document=gdome_n_ownerDocument(dome_node, &exc); - if(!dome_document) - dome_document=GDOME_DOC(dome_node); - xmlDoc *xml_document=((_Gdome_xml_Document *)dome_document)->n; + if(!dome_document) // document does not own itself, so ownerDocument = 0 + 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)); - ctxt->node=xmlDocGetRootElement(xml_document); + ctxt->node=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()) - switch(res->type) { - case XPATH_UNDEFINED: break; - case XPATH_NODESET: - { - if(res->nodesetval->nodeNr>1) - throw Exception(0, 0, - &expression, - "resulted not in a single node (%d)", res->nodesetval->nodeNr); - - VXnode& result=*new(pool) VXnode( - pool, - gdome_xml_n_mkref(res->nodesetval->nodeTab[0])); - result.set_name(method_name); - r.write_no_lang(result); - break; + 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]))); } - //case XPATH_BOOLEAN: nothing; break; - //case XPATH_NUMBER: nothing; break; - //case XPATH_STRING: nothing; break; - default: - throw Exception(0, 0, + } + break; + default: + throw Exception(0, 0, + &expression, + "wrong xmlXPathEvalExpression result type (%d)", res->type); + break; // never + } +} + +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, - "unrecognized xmlXPathEvalExpression result type (%d)", res->type); - break; // never + "resulted not in a single node (%d)", res->nodesetval->nodeNr); + + result=new(pool) VXnode(pool, gdome_xml_n_mkref(res->nodesetval->nodeTab[0])); } + 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 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 + } +} + +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 @@ -508,10 +623,16 @@ MXnode::MXnode(Pool& apool) : Methoded(a /// parser // ^node.select[/some/xpath/query] = hash $.#[dnode] -// add_native_method("select", Method::CT_DYNAMIC, _select, 1, 1); + 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