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/08/30 23:36:47 UTC
svn commit: r1379168 -
/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringScalarEvaluatorFactory.java
Author: prestonc
Date: Thu Aug 30 21:36:47 2012
New Revision: 1379168
URL: http://svn.apache.org/viewvc?rev=1379168&view=rev
Log:
Found that some of the conversions needed to be separated out.
Modified:
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringScalarEvaluatorFactory.java
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringScalarEvaluatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringScalarEvaluatorFactory.java?rev=1379168&r1=1379167&r2=1379168&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringScalarEvaluatorFactory.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringScalarEvaluatorFactory.java Thu Aug 30 21:36:47 2012
@@ -56,16 +56,25 @@ public class FnStringScalarEvaluatorFact
abvs.reset();
switch (tvp1.getTag()) {
case ValueTag.XS_ANY_URI_TAG:
+ tvp1.getValue(tp.utf8sp);
+ castToString.convertAnyURI(tp.utf8sp, dOut);
+ break;
case ValueTag.XS_STRING_TAG:
+ tvp1.getValue(tp.utf8sp);
+ castToString.convertString(tp.utf8sp, dOut);
+ break;
case ValueTag.XS_UNTYPED_ATOMIC_TAG:
tvp1.getValue(tp.utf8sp);
- castToString.convertAnyURI(tp.utf8sp, dOut);
+ castToString.convertUntypedAtomic(tp.utf8sp, dOut);
break;
case ValueTag.XS_BASE64_BINARY_TAG:
- case ValueTag.XS_HEX_BINARY_TAG:
tvp1.getValue(tp.binaryp);
castToString.convertBase64Binary(tp.binaryp, dOut);
break;
+ case ValueTag.XS_HEX_BINARY_TAG:
+ tvp1.getValue(tp.binaryp);
+ castToString.convertHexBinary(tp.binaryp, dOut);
+ break;
case ValueTag.XS_BOOLEAN_TAG:
tvp1.getValue(tp.boolp);
castToString.convertBoolean(tp.boolp, dOut);
@@ -75,6 +84,9 @@ public class FnStringScalarEvaluatorFact
castToString.convertDatetime(tp.datetimep, dOut);
break;
case ValueTag.XS_DAY_TIME_DURATION_TAG:
+ tvp1.getValue(tp.longp);
+ castToString.convertDTDuration(tp.longp, dOut);
+ break;
case ValueTag.XS_INTEGER_TAG:
case ValueTag.XS_NON_POSITIVE_INTEGER_TAG:
case ValueTag.XS_NEGATIVE_INTEGER_TAG:
@@ -84,20 +96,35 @@ public class FnStringScalarEvaluatorFact
case ValueTag.XS_POSITIVE_INTEGER_TAG:
case ValueTag.XS_UNSIGNED_INT_TAG:
tvp1.getValue(tp.longp);
- castToString.convertDTDuration(tp.longp, dOut);
+ castToString.convertInteger(tp.longp, dOut);
break;
case ValueTag.XS_DURATION_TAG:
tvp1.getValue(tp.durationp);
castToString.convertDuration(tp.durationp, dOut);
break;
case ValueTag.XS_DATE_TAG:
+ tvp1.getValue(tp.datep);
+ castToString.convertDate(tp.datep, dOut);
+ break;
case ValueTag.XS_G_DAY_TAG:
+ tvp1.getValue(tp.datep);
+ castToString.convertGDay(tp.datep, dOut);
+ break;
case ValueTag.XS_G_MONTH_DAY_TAG:
+ tvp1.getValue(tp.datep);
+ castToString.convertGMonthDay(tp.datep, dOut);
+ break;
case ValueTag.XS_G_MONTH_TAG:
+ tvp1.getValue(tp.datep);
+ castToString.convertGMonth(tp.datep, dOut);
+ break;
case ValueTag.XS_G_YEAR_MONTH_TAG:
+ tvp1.getValue(tp.datep);
+ castToString.convertGYearMonth(tp.datep, dOut);
+ break;
case ValueTag.XS_G_YEAR_TAG:
tvp1.getValue(tp.datep);
- castToString.convertDate(tp.datep, dOut);
+ castToString.convertGYear(tp.datep, dOut);
break;
case ValueTag.XS_QNAME_TAG:
tvp1.getValue(tp.qnamep);
@@ -108,10 +135,13 @@ public class FnStringScalarEvaluatorFact
castToString.convertTime(tp.timep, dOut);
break;
case ValueTag.XS_YEAR_MONTH_DURATION_TAG:
+ tvp1.getValue(tp.intp);
+ castToString.convertYMDuration(tp.intp, dOut);
+ break;
case ValueTag.XS_INT_TAG:
case ValueTag.XS_UNSIGNED_SHORT_TAG:
tvp1.getValue(tp.intp);
- castToString.convertYMDuration(tp.intp, dOut);
+ castToString.convertInt(tp.intp, dOut);
break;
case ValueTag.XS_DECIMAL_TAG:
tvp1.getValue(tp.decp);