sboag 00/11/16 12:51:30
Modified: java/src/org/apache/xalan/processor XSLTSchema.java
java/src/org/apache/xalan/utils DefaultErrorHandler.java
java/src/org/apache/xpath/functions FuncLocalPart.java
FuncNamespace.java FuncSystemProperty.java
Log:
Fix name and namespace functions so they don't return names for "#xxx" names.
Fix version system property so that it returns the version of the spec we
conform to.
Fix terminate attribute on xsl:message.
Don't put out warning prefix for a warning in the default error listener.
Revision Changes Path
1.12 +1 -1
xml-xalan/java/src/org/apache/xalan/processor/XSLTSchema.java
Index: XSLTSchema.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/processor/XSLTSchema.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XSLTSchema.java 2000/10/30 18:40:44 1.11
+++ XSLTSchema.java 2000/11/16 20:51:29 1.12
@@ -438,7 +438,7 @@
XSLTElementDef xslMessage =
new XSLTElementDef(Constants.S_XSLNAMESPACEURL, "message",
null /*alias */, templateElements /* elements */,
// %template;>
- new XSLTAttributeDef[]{},
+ new XSLTAttributeDef[]{terminateAttr},
new ProcessorTemplateElem(),
ElemMessage.class /* class object */);
XSLTElementDef xslFallback =
1.5 +1 -1
xml-xalan/java/src/org/apache/xalan/utils/DefaultErrorHandler.java
Index: DefaultErrorHandler.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/utils/DefaultErrorHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultErrorHandler.java 2000/11/15 16:18:46 1.4
+++ DefaultErrorHandler.java 2000/11/16 20:51:29 1.5
@@ -182,7 +182,7 @@
{
printLocation(exception);
- System.out.println("Parser warning: " + exception.getMessage());
+ System.out.println(exception.getMessage());
}
/**
1.4 +7 -3
xml-xalan/java/src/org/apache/xpath/functions/FuncLocalPart.java
Index: FuncLocalPart.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncLocalPart.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FuncLocalPart.java 2000/11/13 16:27:33 1.3
+++ FuncLocalPart.java 2000/11/16 20:51:29 1.4
@@ -87,9 +87,13 @@
{
Node context = getArg0AsNode(xctxt);
-
- return new XString((context != null)
+
+ String s = (context != null)
? xctxt.getDOMHelper().getLocalNameOfNode(context)
- : "");
+ : "";
+ if(s.startsWith("#"))
+ s = "";
+
+ return new XString(s);
}
}
1.4 +22 -4
xml-xalan/java/src/org/apache/xpath/functions/FuncNamespace.java
Index: FuncNamespace.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncNamespace.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FuncNamespace.java 2000/11/13 16:27:33 1.3
+++ FuncNamespace.java 2000/11/16 20:51:29 1.4
@@ -87,9 +87,27 @@
{
Node context = getArg0AsNode(xctxt);
-
- return new XString((context != null)
- ? xctxt.getDOMHelper().getNamespaceOfNode(context)
- : "");
+
+ String s;
+ if(context != null)
+ {
+ int t = context.getNodeType();
+ if(t == Node.ELEMENT_NODE)
+ {
+ s = xctxt.getDOMHelper().getNamespaceOfNode(context);
+ }
+ else if(t == Node.ATTRIBUTE_NODE)
+ {
+ s = xctxt.getDOMHelper().getNamespaceOfNode(context);
+ if(s.startsWith("xmlns:") || s.equals("xmlns"))
+ return XString.EMPTYSTRING;
+ }
+ else
+ return XString.EMPTYSTRING;
+ }
+ else
+ return XString.EMPTYSTRING;
+
+ return new XString(s);
}
}
1.5 +2 -1
xml-xalan/java/src/org/apache/xpath/functions/FuncSystemProperty.java
Index: FuncSystemProperty.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncSystemProperty.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FuncSystemProperty.java 2000/11/16 20:04:51 1.4
+++ FuncSystemProperty.java 2000/11/16 20:51:29 1.5
@@ -182,7 +182,8 @@
{
try
{
- return new XNumber(new Double(result).doubleValue());
+ // Needs to return the version number of the spec we conform to.
+ return new XNumber(1.0);
}
catch (Exception ex)
{
