You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vxquery.apache.org by pr...@apache.org on 2012/09/25 03:02:12 UTC
svn commit: r1389671 -
/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/qname/FnPrefixFromQNameScalarEvaluatorFactory.java
Author: prestonc
Date: Tue Sep 25 01:02:12 2012
New Revision: 1389671
URL: http://svn.apache.org/viewvc?rev=1389671&view=rev
Log:
One more function fixed for empty sequences.
Modified:
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/qname/FnPrefixFromQNameScalarEvaluatorFactory.java
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/qname/FnPrefixFromQNameScalarEvaluatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/qname/FnPrefixFromQNameScalarEvaluatorFactory.java?rev=1389671&r1=1389670&r2=1389671&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/qname/FnPrefixFromQNameScalarEvaluatorFactory.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/qname/FnPrefixFromQNameScalarEvaluatorFactory.java Tue Sep 25 01:02:12 2012
@@ -18,9 +18,11 @@ package org.apache.vxquery.runtime.funct
import java.io.DataOutput;
+import org.apache.vxquery.datamodel.accessors.SequencePointable;
import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
import org.apache.vxquery.datamodel.accessors.atomic.XSQNamePointable;
import org.apache.vxquery.datamodel.values.ValueTag;
+import org.apache.vxquery.datamodel.values.XDMConstants;
import org.apache.vxquery.exceptions.ErrorCode;
import org.apache.vxquery.exceptions.SystemException;
import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluator;
@@ -44,6 +46,7 @@ public class FnPrefixFromQNameScalarEval
protected IScalarEvaluator createEvaluator(IHyracksTaskContext ctx, IScalarEvaluator[] args)
throws AlgebricksException {
final XSQNamePointable qnamep = (XSQNamePointable) XSQNamePointable.FACTORY.createPointable();
+ final SequencePointable seqp = (SequencePointable) SequencePointable.FACTORY.createPointable();
final ArrayBackedValueStorage abvs = new ArrayBackedValueStorage();
final DataOutput dOut = abvs.getDataOutput();
@@ -52,21 +55,31 @@ public class FnPrefixFromQNameScalarEval
protected void evaluate(TaggedValuePointable[] args, IPointable result) throws SystemException {
TaggedValuePointable tvp1 = args[0];
- // TODO return empty sequence if argument is empty sequence.
-
- // Only accept a strings.
+ // Only accept a QNames or empty sequence.
+ if (tvp1.getTag() == ValueTag.SEQUENCE_TAG) {
+ tvp1.getValue(seqp);
+ if (seqp.getEntryCount() == 0) {
+ XDMConstants.setEmptySequence(result);
+ return;
+ }
+ // Pass through.
+ }
if (tvp1.getTag() != ValueTag.XS_QNAME_TAG) {
throw new SystemException(ErrorCode.FORG0006);
}
tvp1.getValue(qnamep);
try {
- // TODO return empty sequence if no prefix.
- abvs.reset();
- dOut.write(ValueTag.XS_NCNAME_TAG);
- dOut.write(qnamep.getByteArray(), qnamep.getStartOffset() + qnamep.getUriLength(),
- qnamep.getPrefixLength());
- result.set(abvs);
+ // Return empty sequence if no prefix.
+ if (qnamep.getPrefixLength() == 0) {
+ XDMConstants.setEmptySequence(result);
+ } else {
+ abvs.reset();
+ dOut.write(ValueTag.XS_NCNAME_TAG);
+ dOut.write(qnamep.getByteArray(), qnamep.getStartOffset() + qnamep.getUriLength(),
+ qnamep.getPrefixLength());
+ result.set(abvs);
+ }
} catch (Exception e) {
throw new SystemException(ErrorCode.SYSE0001, e);
}