--- parser3/src/classes/xdoc.C	2007/08/20 10:02:51	1.155
+++ parser3/src/classes/xdoc.C	2009/04/10 11:31:06	1.157
@@ -1,7 +1,7 @@
 /** @file
 	Parser: @b xdoc parser class.
 
-	Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
@@ -9,7 +9,7 @@
 
 #ifdef XML
 
-static const char * const IDENT_XDOC_C="$Date: 2007/08/20 10:02:51 $";
+static const char * const IDENT_XDOC_C="$Date: 2009/04/10 11:31:06 $";
 
 #include "libxml/tree.h"
 #include "libxml/HTMLtree.h"
@@ -266,7 +266,7 @@ static void _createTextNode(Request& r,
 	VXdoc& vdoc=GET_SELF(r, VXdoc);
 	xmlDoc& xmldoc=vdoc.get_xmldoc();
 
-	xmlChar* data=as_xmlchar(r, params, 0, "data must be string");
+	xmlChar* data=as_xmlchar(r, params, 0, DATA_MUST_BE_STRING);
 
 	xmlNode *node=xmlNewDocText(&xmldoc, data);
 	writeNode(r, vdoc, node);
@@ -276,7 +276,7 @@ static void _createTextNode(Request& r,
 static void _createComment(Request& r, MethodParams& params) {
 	VXdoc& vdoc=GET_SELF(r, VXdoc);
 
-	xmlChar* data=as_xmlchar(r, params, 0, "data must be string");
+	xmlChar* data=as_xmlchar(r, params, 0, DATA_MUST_BE_STRING);
 
 	xmlNode *node=xmlNewComment(data);
 	writeNode(r, vdoc, node);
@@ -287,7 +287,7 @@ static void _createCDATASection(Request&
 	VXdoc& vdoc=GET_SELF(r, VXdoc);
 	xmlDoc& xmldoc=vdoc.get_xmldoc();
 
-	xmlChar* data=as_xmlchar(r, params, 0, "data must be string");
+	xmlChar* data=as_xmlchar(r, params, 0, DATA_MUST_BE_STRING);
 
 	xmlNode *node=xmlNewCDataBlock(&xmldoc, data, strlen((const char*)data));
 	writeNode(r, vdoc, node);
@@ -298,8 +298,8 @@ static void _createProcessingInstruction
 	VXdoc& vdoc=GET_SELF(r, VXdoc);
 	xmlDoc& xmldoc=vdoc.get_xmldoc();
 
-	xmlChar* target=as_xmlchar(r, params, 0, "data must be string");
-	xmlChar* data=as_xmlchar(r, params, 1, "data must be string");
+	xmlChar* target=as_xmlchar(r, params, 0, DATA_MUST_BE_STRING);
+	xmlChar* data=as_xmlchar(r, params, 1, DATA_MUST_BE_STRING);
 
 	xmlNode *node=xmlNewDocPI(&xmldoc, target, data);
 	writeNode(r, vdoc, node);
@@ -454,14 +454,14 @@ static void _load(Request& r, MethodPara
 	VXdoc& vdoc=GET_SELF(r, VXdoc);
 
 	// filespec
-	const String* uri=&params.as_string(0, "uri must be string");
+	const String* uri=&params.as_string(0, "URI must be string");
 	const char* uri_cstr;
 	if(uri->pos("://")==STRING_NOT_FOUND) // disk path
 		uri_cstr=r.absolute(*uri).cstr(String::L_FILE_SPEC);
 	else // xxx:// 
 		uri_cstr=uri->cstr(String::L_AS_IS); // leave as-is for xmlParseFile to handle
 
-	/// todo!! add SAFE MODE!!
+	/// @todo!! add SAFE MODE!!
 	xmlDoc* xmldoc=xmlParseFile(uri_cstr);
 	if(!xmldoc || xmlHaveGenericErrors())
 		throw XmlException(uri);