santiagopg 2003/03/26 09:39:33
Modified: java/src/org/apache/xalan/xsltc/compiler KeyCall.java
Log:
Committing patch from Arun Yadav ([EMAIL PROTECTED]) for Bugzilla
15830. Correct handling for id()/key() values of type result-tree.
Revision Changes Path
1.12 +3 -5
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/KeyCall.java
Index: KeyCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/KeyCall.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- KeyCall.java 30 Jan 2003 18:46:00 -0000 1.11
+++ KeyCall.java 26 Mar 2003 17:39:33 -0000 1.12
@@ -171,9 +171,7 @@
// be added to the resulting node-set.
_valueType = _value.typeCheck(stable);
- if (_valueType != Type.NodeSet && _valueType != Type.ResultTree
- && _valueType != Type.String)
- {
+ if (_valueType != Type.NodeSet && _valueType != Type.String) {
_value = new CastExpr(_value, Type.String);
}
@@ -262,7 +260,7 @@
// If the second paramter is a node-set we need to go through each
// node in the set, convert each one to a string and do a look up in
// the named index, and then merge all the resulting node sets.
- if (_valueType == Type.NodeSet || _valueType == Type.ResultTree) {
+ if (_valueType == Type.NodeSet) {
// Save current node and current iterator on the stack
il.append(methodGen.loadCurrentNode());
il.append(methodGen.loadIterator());
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
