sboag 99/12/14 12:51:21
Modified: src/org/apache/xalan/xslt FuncDocument.java
Log:
Fixed bad error messages when document(...) function fails, but the error
resources should come from the XSLT engine, and not from the XPath engine, so
this needs a longer term fix.
Revision Changes Path
1.4 +6 -3 xml-xalan/src/org/apache/xalan/xslt/FuncDocument.java
Index: FuncDocument.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xslt/FuncDocument.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FuncDocument.java 1999/11/28 10:26:22 1.3
+++ FuncDocument.java 1999/12/14 20:51:21 1.4
@@ -168,6 +168,8 @@
}
else
{
+ // TODO: Note the the warning calls below go through XPath, instead
+ // of XSLT, as the should.
try
{
XMLParserLiaison parserLiaison = (XMLParserLiaison)execContext;
@@ -180,16 +182,17 @@
}
else
{
- path.warn(XSLTErrorResources.WARNING0006, new
Object[]{((base == null) ? "" : base )+uri}); //"Can not make URL from:
"+((base == null) ? "" : base )+uri);
+ path.warn(XSLTErrorResources.WARNING0010, new Object[]{((base ==
null) ? "" : base )+uri}); //"Can not make URL from: "+((base == null) ? "" :
base )+uri);
}
}
catch(Exception e)
{
- path.warn(XSLTErrorResources.WARNING0007, new Object[]{((base ==
null) ? "" : base )+uri}); //"Can not load requested doc: "+((base == null) ?
"" : base )+uri);
+ newDoc = null;
+ // path.warn(XSLTErrorResources.WARNING0011, new Object[]{((base
== null) ? "" : base )+uri}); //"Can not load requested doc: "+((base == null)
? "" : base )+uri);
}
if(null == newDoc)
{
- path.warn(XSLTErrorResources.WARNING0007, new Object[]{((base ==
null) ? "" : base )+uri}); //"Can not load requested doc: "+((base == null) ?
"" : base )+uri);
+ path.warn(XSLTErrorResources.WARNING0011, new Object[]{((base ==
null) ? "" : base )+uri}); //"Can not load requested doc: "+((base == null) ?
"" : base )+uri);
}
else
{
