sboag 01/08/20 16:48:10 Modified: java/src/org/apache/xpath/functions FuncCurrent.java Log: Call new XPathContext#getCurrentNodeList. Fixes http://nagoya.apache.org/bugzilla/show_bug.cgi?id=3031. Revision Changes Path 1.8 +14 -3 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.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- FuncCurrent.java 2001/06/12 19:16:33 1.7 +++ FuncCurrent.java 2001/08/20 23:48:10 1.8 @@ -98,10 +98,12 @@ // %TBD% Hack city... if (null != subContextList && subContextList instanceof PredicatedNodeTest) { - PredicatedNodeTest iter = (PredicatedNodeTest) xctxt.getSubContextList(); - LocPathIterator lpi = iter.getLocPathIterator(); + // PredicatedNodeTest iter = (PredicatedNodeTest) xctxt.getSubContextList(); + // LocPathIterator lpi = iter.getLocPathIterator(); + LocPathIterator lpi = xctxt.getCurrentNodeList(); - currentNode = lpi.getCurrentContextNode(); + currentNode = lpi.getCurrentContextNode(); + } else if(xctxt.getIteratorRoot() != DTM.NULL) { @@ -119,6 +121,15 @@ else currentNode = DTM.NULL; } + // if(DTM.NULL != currentNode) + // { + // DTM dtm = xctxt.getDTM(currentNode); + // System.err.println("current node: "+dtm.getNodeName(currentNode)+"["+Integer.toHexString(currentNode)+"]"); + // } + // else + // { + // System.err.println("current node: DTM.NULL"); + // } return new XNodeSet(currentNode, xctxt.getDTMManager()); }
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
