--- parser3/src/classes/xnode.C 2001/09/26 15:43:59 1.2 +++ parser3/src/classes/xnode.C 2001/10/11 14:58:15 1.5 @@ -4,7 +4,7 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - $Id: xnode.C,v 1.2 2001/09/26 15:43:59 parser Exp $ + $Id: xnode.C,v 1.5 2001/10/11 14:58:15 parser Exp $ */ #include "classes.h" #ifdef XML @@ -61,7 +61,7 @@ static void _select(Request& r, const St result.set_name(method_name); r.write_no_lang(result); } catch(const XSLException& e) { - r._throw(&expression, e); + pool.exception()._throw(pool, &expression, e); } } @@ -92,7 +92,7 @@ static void _select_single(Request& r, c r.write_no_lang(result); } } catch(const XSLException& e) { - r._throw(&expression, e); + pool.exception()._throw(pool, &expression, e); } } @@ -105,8 +105,8 @@ MXnode::MXnode(Pool& apool) : Methoded(a // ^node.select[/some/xpath/query] = hash $.#[dnode] add_native_method("select", Method::CT_DYNAMIC, _select, 1, 1); - // ^node.select-single[/some/xpath/query] = first dnode - add_native_method("select-single", Method::CT_DYNAMIC, _select_single, 1, 1); + // ^node.selectSingle[/some/xpath/query] = first dnode + add_native_method("selectSingle", Method::CT_DYNAMIC, _select_single, 1, 1); // consts @@ -127,6 +127,7 @@ MXnode::MXnode(Pool& apool) : Methoded(a CONST(NOTATION_NODE, 12); } + // global variable Methoded *Xnode_class;