--- parser3/src/main/pa_exception.C	2001/11/20 17:58:47	1.27
+++ parser3/src/main/pa_exception.C	2002/01/21 12:33:26	1.32
@@ -4,36 +4,104 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
 
-	$Id: pa_exception.C,v 1.27 2001/11/20 17:58:47 paf Exp $
+	$Id: pa_exception.C,v 1.32 2002/01/21 12:33:26 paf Exp $
 */
 
 #include "pa_common.h"
 #include "pa_exception.h"
+#include "pa_globals.h"
 
 Exception::Exception() {
 	ftype=fcode=fproblem_source=0;
 	owns_comment=false; fcomment=0;
 }
-Exception::Exception(const String *atype, const String *acode,
-					  const String *aproblem_source, 
-					  const char *comment_fmt, ...) {
+void Exception::initialize(
+	const String *atype, const String *acode,
+	const String *aproblem_source, 
+	const char *comment_fmt, va_list args) {
 	//_asm int 3;
 //__asm__("int3");
-
 	ftype=atype;
 	fcode=acode;
 	fproblem_source=aproblem_source;
 	owns_comment=true;
 
 	if(comment_fmt) {
-		va_list args;
-		va_start(args, comment_fmt);
 		fcomment=(char *)malloc(MAX_STRING);
 		vsnprintf(fcomment, MAX_STRING, comment_fmt, args);
-		va_end(args);
 	} else
 		fcomment=0;
 }
+Exception::Exception(
+	const String *atype, const String *acode,
+	const String *aproblem_source, 
+	const char *comment_fmt, va_list args) {
+	initialize(atype, acode, aproblem_source, comment_fmt, args);
+}
+Exception::Exception(const String *atype, const String *acode,
+					  const String *aproblem_source, 
+					  const char *comment_fmt, ...) {
+	va_list args;
+    va_start(args, comment_fmt);
+	initialize(atype, acode, aproblem_source, comment_fmt, args);
+	va_end(args);
+}
+Exception::Exception(
+	const String *atype, const String *acode,
+	const String *aproblem_source, 
+	GdomeException& exc) :
+	ftype(atype),
+	fcode(acode),
+	fproblem_source(aproblem_source),
+	owns_comment(true) {
+
+	const char *xml_generic_errors=xmlGenericErrors();
+	if(xml_generic_errors || exc) {
+		const char *s;
+		switch((GdomeExceptionCode)exc) {
+		case GDOME_NOEXCEPTION_ERR: s="NOEXCEPTION_ERR"; break;
+		case GDOME_INDEX_SIZE_ERR: s="INDEX_SIZE_ERR"; break;
+		case GDOME_DOMSTRING_SIZE_ERR: s="DOMSTRING_SIZE_ERR"; break;
+		case GDOME_HIERARCHY_REQUEST_ERR: s="HIERARCHY_REQUEST_ERR"; break;
+		case GDOME_WRONG_DOCUMENT_ERR: s="WRONG_DOCUMENT_ERR"; break;
+		case GDOME_INVALID_CHARACTER_ERR: s="INVALID_CHARACTER_ERR"; break;
+		case GDOME_NO_DATA_ALLOWED_ERR: s="NO_DATA_ALLOWED_ERR"; break;
+		case GDOME_NO_MODIFICATION_ALLOWED_ERR: s="NO_MODIFICATION_ALLOWED_ERR"; break;
+		case GDOME_NOT_FOUND_ERR: s="NOT_FOUND_ERR"; break;
+		case GDOME_NOT_SUPPORTED_ERR: s="NOT_SUPPORTED_ERR"; break;
+		case GDOME_INUSE_ATTRIBUTE_ERR: s="INUSE_ATTRIBUTE_ERR"; break;
+		case GDOME_INVALID_STATE_ERR: s="INVALID_STATE_ERR"; break;
+		case GDOME_SYNTAX_ERR: s="SYNTAX_ERR"; break;
+		case GDOME_INVALID_MODIFICATION_ERR: s="INVALID_MODIFICATION_ERR"; break;
+		case GDOME_NAMESPACE_ERR: s="NAMESPACE_ERR"; break;
+		case GDOME_INVALID_ACCESS_ERR: s="INVALID_ACCESS_ERR"; break;
+		case GDOME_NULL_POINTER_ERR: s="NULL_POINTER_ERR"; break;
+		default: s="<UNKNOWN CODE>"; break;
+		}
+		
+		fcomment=(char *)malloc(MAX_STRING);
+		const char *xml_error_message=
+			xml_generic_errors?xml_generic_errors:"<no xml_generic_errors>";
+		if(exc)
+			snprintf(fcomment, MAX_STRING, 
+				"DOMException %s (%d).\n"
+				"%s", 
+					s,  // decoded code of exception
+					exc, // DOM exception code
+					xml_error_message // xml generic messages accumulated
+			);
+		else // no DOM exception
+			snprintf(fcomment, MAX_STRING, 
+				"%s", 
+					xml_error_message // xml generic messages accumulated
+			);
+		if(xml_generic_errors)
+			free((void *)xml_generic_errors);
+	} else
+		fcomment=0;
+}
+
+
 Exception::Exception(const Exception& src) : 
 	ftype(src.ftype),
 	fcode(src.fcode),
@@ -62,6 +130,7 @@ Exception::~Exception() {
 }
 
 #ifdef XML
+/*
 void Exception::provide_source(Pool& pool, const String *source, const XSLException& e) {
 	if(e.getURI().empty())
 		throw Exception(0, 0,
@@ -114,34 +183,5 @@ void Exception::provide_source(Pool& poo
 	);
 }
 
-void Exception::provide_source(Pool& pool, const String *source, const XalanDOMException& e) {
-	const char *s;
-	int code=(int)e.getExceptionCode();
-	switch(code) {
-	case 1: s="INDEX_SIZE_ERR"; break;
-	case 2: s="DOMSTRING_SIZE_ERR"; break;
-	case 3: s="HIERARCHY_REQUEST_ERR"; break;
-	case 4: s="WRONG_DOCUMENT_ERR"; break;
-	case 5: s="INVALID_CHARACTER_ERR"; break;
-	case 6: s="NO_DATA_ALLOWED_ERR"; break;
-	case 7: s="NO_MODIFICATION_ALLOWED_ERR"; break;
-	case 8: s="NOT_FOUND_ERR"; break;
-	case 9: s="NOT_SUPPORTED_ERR"; break;
-	case 10: s="INUSE_ATTRIBUTE_ERR"; break;
-	case 11: s="INVALID_STATE_ERR"; break;
-	case 12: s="SYNTAX_ERR"; break;
-	case 13: s="INVALID_MODIFICATION_ERR"; break;
-	case 14: s="NAMESPACE_ERR"; break;
-	case 15: s="INVALID_ACCESS_ERR"; break;
-	case 201: s="UNKNOWN_ERR"; break;
-	case 202: s="TRANSCODING_ERR"; break;
-	default: s="<UNKNOWN CODE>"; break;
-	}
-	throw Exception(0, 0,
-		source,
-		"XalanDOMException %s (%d)",
-			s,  // decoded code of exception
-			code // code of exception
-	);
-}
+*/
 #endif