You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by mk...@apache.org on 2002/09/16 18:29:04 UTC
cvs commit: xml-xalan/java/src/org/apache/xalan/processor XSLTSchema.java ProcessorExsltFunction.java
mkwan 2002/09/16 09:29:04
Modified: java/src/org/apache/xalan/processor XSLTSchema.java
ProcessorExsltFunction.java
Log:
For Bugzilla 12077. Fixed problem with func:function in included stylesheet.
Add exsltFunction to the templateElements list so that we can detect the error where
func:function is embedded in another (e.g. xsl:variable) element.
Revision Changes Path
1.30 +5 -4 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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- XSLTSchema.java 26 Jul 2002 00:28:16 -0000 1.29
+++ XSLTSchema.java 16 Sep 2002 16:29:03 -0000 1.30
@@ -348,11 +348,11 @@
new XSLTAttributeDef(Constants.S_XSLNAMESPACEURL, "*",
XSLTAttributeDef.T_CDATA, false, false,XSLTAttributeDef.WARNING);
- XSLTElementDef[] templateElements = new XSLTElementDef[22];
- XSLTElementDef[] templateElementsAndParams = new XSLTElementDef[23];
- XSLTElementDef[] templateElementsAndSort = new XSLTElementDef[23];
+ XSLTElementDef[] templateElements = new XSLTElementDef[23];
+ XSLTElementDef[] templateElementsAndParams = new XSLTElementDef[24];
+ XSLTElementDef[] templateElementsAndSort = new XSLTElementDef[24];
//exslt
- XSLTElementDef[] exsltFunctionElements = new XSLTElementDef[23];
+ XSLTElementDef[] exsltFunctionElements = new XSLTElementDef[24];
XSLTElementDef[] charTemplateElements = new XSLTElementDef[15];
XSLTElementDef resultElement = new XSLTElementDef(this, null, "*",
@@ -617,6 +617,7 @@
templateElements[i++] = xslAttribute;
templateElements[i++] = resultElement;
templateElements[i++] = unknownElement;
+ templateElements[i++] = exsltFunction;
templateElements[i++] = exsltResult;
int k;
1.3 +1 -1 xml-xalan/java/src/org/apache/xalan/processor/ProcessorExsltFunction.java
Index: ProcessorExsltFunction.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/processor/ProcessorExsltFunction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ProcessorExsltFunction.java 10 Jun 2002 19:24:41 -0000 1.2
+++ ProcessorExsltFunction.java 16 Sep 2002 16:29:03 -0000 1.3
@@ -100,7 +100,7 @@
{
//System.out.println("ProcessorFunction.startElement()");
String msg = "";
- if (!(handler.getElemTemplateElement() instanceof StylesheetRoot))
+ if (!(handler.getElemTemplateElement() instanceof Stylesheet))
{
msg = "func:function element must be top level.";
handler.error(msg, new SAXException(msg));
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org