--- parser3/src/classes/xdoc.C 2007/02/28 19:36:31 1.153 +++ parser3/src/classes/xdoc.C 2007/08/20 10:02:51 1.155 @@ -9,7 +9,7 @@ #ifdef XML -static const char * const IDENT_XDOC_C="$Date: 2007/02/28 19:36:31 $"; +static const char * const IDENT_XDOC_C="$Date: 2007/08/20 10:02:51 $"; #include "libxml/tree.h" #include "libxml/HTMLtree.h" @@ -158,7 +158,7 @@ private: static void writeNode(Request& r, VXdoc& xdoc, xmlNode* node) { if(!node) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "error creating node"); // OOM, bad name, things like that @@ -237,7 +237,7 @@ static void _createElementNS(Request& r, xmlDoc& xmldoc=vdoc.get_xmldoc(); // namespaceURI;localName - xmlChar* namespaceURI=as_xmlchar(r, params, 0, "namespaceURI must be string"); + xmlChar* namespaceURI=as_xmlchar(r, params, 0, NAMESPACEURI_MUST_BE_STRING); xmlChar* qualifiedName=as_xmlchar(r, params, 1, "qualifiedName must be string"); xmlChar* prefix=0; @@ -310,7 +310,7 @@ static void _createAttribute(Request& r, VXdoc& vdoc=GET_SELF(r, VXdoc); xmlDoc& xmldoc=vdoc.get_xmldoc(); - xmlChar* name=as_xmlchar(r, params, 0, "name must be string"); + xmlChar* name=as_xmlchar(r, params, 0, NAME_MUST_BE_STRING); xmlNode *node=(xmlNode*)xmlNewDocProp(&xmldoc, name, 0); writeNode(r, vdoc, node); @@ -321,8 +321,8 @@ static void _createAttributeNS(Request& VXdoc& vdoc=GET_SELF(r, VXdoc); xmlDoc& xmldoc=vdoc.get_xmldoc(); - xmlChar* namespaceURI=as_xmlchar(r, params, 0, "namespaceURI must be string"); - xmlChar* qualifiedName=as_xmlchar(r, params, 1, "name must be string"); + xmlChar* namespaceURI=as_xmlchar(r, params, 0, NAMESPACEURI_MUST_BE_STRING); + xmlChar* qualifiedName=as_xmlchar(r, params, 1, NAME_MUST_BE_STRING); xmlChar* prefix=0; xmlChar* localName=xmlSplitQName2(qualifiedName, &prefix); @@ -342,7 +342,7 @@ static void _createEntityReference(Reque VXdoc& vdoc=GET_SELF(r, VXdoc); xmlDoc& xmldoc=vdoc.get_xmldoc(); - xmlChar* name=as_xmlchar(r, params, 0, "name must be string"); + xmlChar* name=as_xmlchar(r, params, 0, NAME_MUST_BE_STRING); xmlNode *node=xmlNewReference(&xmldoc, name); writeNode(r, vdoc, node); @@ -487,7 +487,7 @@ static void param_option_over_output_opt else if(s=="no") output_option=0; else - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, &s, "%s must be either 'yes' or 'no'", option_name); } @@ -577,7 +577,7 @@ static Xdoc2buf_result xdoc2buf(Request& xmlCharEncodingHandler *renderer=xmlFindCharEncodingHandler(render_encoding); if(!renderer) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "encoding '%s' not supported", render_encoding); // UTF-8 renderer contains empty input/output converters, @@ -667,7 +667,7 @@ static void _file(Request& r, MethodPara static void _save(Request& r, MethodParams& params) { VXdoc& vdoc=GET_SELF(r, VXdoc); - const String& file_spec=r.absolute(params.as_string(0, "file name must be string")); + const String& file_spec=r.absolute(params.as_string(0, FILE_NAME_MUST_BE_STRING)); VXdoc::Output_options oo(vdoc.output_options); xdoc2buf(r, vdoc, params, 1, @@ -775,7 +775,7 @@ static void _transform(Request& r, Metho hash->for_each(add_xslt_param, &info); transform_params[hash->count()*2]=0; } else - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "transform parameters parameter must be hash"); }