sboag 01/05/26 20:36:30
Modified: java/src/org/apache/xpath/functions Tag: DTM_EXP
FuncCurrent.java
Log:
Think this file was overwritten from the merge with Myriam's stuff.
Revision Changes Path
No revision
No revision
1.5.2.6 +9 -5
xml-xalan/java/src/org/apache/xpath/functions/FuncCurrent.java
Index: FuncCurrent.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncCurrent.java,v
retrieving revision 1.5.2.5
retrieving revision 1.5.2.6
diff -u -r1.5.2.5 -r1.5.2.6
--- FuncCurrent.java 2001/05/27 03:05:16 1.5.2.5
+++ FuncCurrent.java 2001/05/27 03:36:30 1.5.2.6
@@ -91,17 +91,21 @@
*/
public XObject execute(XPathContext xctxt) throws
javax.xml.transform.TransformerException
{
-
// If we're in a predicate, then this will return non-null.
- //PredicatedNodeTest iter = (PredicatedNodeTest)
xctxt.getSubContextList();
- SubContextList iter = xctxt.getSubContextList();
+ Object subContextList = xctxt.getSubContextList();
int currentNode;
- if (null != iter && iter instanceof PredicatedNodeTest)
+ // %TBD% Hack city...
+ if (null != subContextList && subContextList instanceof
PredicatedNodeTest)
{
- LocPathIterator lpi = ((PredicatedNodeTest)iter).getLocPathIterator();
+ PredicatedNodeTest iter = (PredicatedNodeTest)
xctxt.getSubContextList();
+ LocPathIterator lpi = iter.getLocPathIterator();
currentNode = lpi.getCurrentContextNode();
+ }
+ else if(xctxt.getIteratorRoot() != DTM.NULL)
+ {
+ currentNode = xctxt.getIteratorRoot();
}
else
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
