You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by vg...@apache.org on 2004/03/19 16:54:16 UTC
cvs commit: avalon-excalibur/xmlutil/src/java/org/apache/excalibur/xml/xpath Saxon7ProcessorImpl.java
vgritsenko 2004/03/19 07:54:16
Modified: xmlutil/src/java/org/apache/excalibur/xml/xpath
Saxon7ProcessorImpl.java
Log:
Fixed Saxon processor to work against Saxon 7.9 release. Tests are passing through.
Revision Changes Path
1.5 +3 -14 avalon-excalibur/xmlutil/src/java/org/apache/excalibur/xml/xpath/Saxon7ProcessorImpl.java
Index: Saxon7ProcessorImpl.java
===================================================================
RCS file: /home/cvs/avalon-excalibur/xmlutil/src/java/org/apache/excalibur/xml/xpath/Saxon7ProcessorImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Saxon7ProcessorImpl.java 28 Feb 2004 11:47:15 -0000 1.4
+++ Saxon7ProcessorImpl.java 19 Mar 2004 15:54:16 -0000 1.5
@@ -79,11 +79,6 @@
return false;
}
- if (item.getItemType() == Type.BOOLEAN)
- {
- return ((BooleanValue)item).getValue();
- }
-
return Boolean.valueOf(item.getStringValue()).booleanValue();
}
catch (final Exception e)
@@ -115,11 +110,6 @@
return null;
}
- if (item.getItemType() == Type.NUMBER)
- {
- return new Double(((DoubleValue)item).getValue());
- }
-
return Double.valueOf(item.getStringValue());
}
catch (final Exception e)
@@ -188,9 +178,8 @@
{
SequenceIterator iterator = evaluate(contextNode, str, resolver);
ArrayList nodes = new ArrayList();
- while (iterator.hasNext())
+ for (Node node = (Node)iterator.current(); node != null; node = (Node)iterator.next())
{
- Node node = (Node)iterator.current();
nodes.add(node);
}
@@ -242,7 +231,7 @@
}
Expression expression = ExpressionTool.make(
- str, new Saxon7Context((NodeInfo)contextNode, resolver));
+ str, new Saxon7Context((NodeInfo)contextNode, resolver), 0, -1);
XPathContext context = new XPathContext((NodeInfo)contextNode);
return expression.iterate(context);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org