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/03 04:10:58 UTC

svn commit: r1368767 - /incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastScalarEvaluatorFactory.java

Author: prestonc
Date: Fri Aug  3 02:10:58 2012
New Revision: 1368767

URL: http://svn.apache.org/viewvc?rev=1368767&view=rev
Log:
Found a missing type definition and fixed a back function call.

Modified:
    incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastScalarEvaluatorFactory.java

Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastScalarEvaluatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastScalarEvaluatorFactory.java?rev=1368767&r1=1368766&r2=1368767&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastScalarEvaluatorFactory.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastScalarEvaluatorFactory.java Fri Aug  3 02:10:58 2012
@@ -76,7 +76,7 @@ public class CastScalarEvaluatorFactory 
                     switch (tid) {
                         case ValueTag.XS_ANY_URI_TAG:
                             tvp.getValue(tp.utf8sp);
-                            aOp.convertString(tp.utf8sp, dOut);
+                            aOp.convertAnyURI(tp.utf8sp, dOut);
                             result.set(abvs);
                             return;
 
@@ -277,27 +277,28 @@ public class CastScalarEvaluatorFactory 
             private int getBaseTypeForCasts(int tid) throws SystemException {
                 while (true) {
                     switch (tid) {
-                        case ValueTag.XS_STRING_TAG:
-                        case ValueTag.XS_DECIMAL_TAG:
-                        case ValueTag.XS_INTEGER_TAG:
-                        case ValueTag.XS_FLOAT_TAG:
-                        case ValueTag.XS_DOUBLE_TAG:
                         case ValueTag.XS_ANY_URI_TAG:
+                        case ValueTag.XS_BASE64_BINARY_TAG:
                         case ValueTag.XS_BOOLEAN_TAG:
                         case ValueTag.XS_DATE_TAG:
                         case ValueTag.XS_DATETIME_TAG:
-                        case ValueTag.XS_TIME_TAG:
                         case ValueTag.XS_DAY_TIME_DURATION_TAG:
-                        case ValueTag.XS_YEAR_MONTH_DURATION_TAG:
-                        case ValueTag.XS_BASE64_BINARY_TAG:
-                        case ValueTag.XS_HEX_BINARY_TAG:
-                        case ValueTag.XS_QNAME_TAG:
+                        case ValueTag.XS_DECIMAL_TAG:
+                        case ValueTag.XS_DOUBLE_TAG:
+                        case ValueTag.XS_DURATION_TAG:
+                        case ValueTag.XS_FLOAT_TAG:
                         case ValueTag.XS_G_DAY_TAG:
                         case ValueTag.XS_G_MONTH_DAY_TAG:
                         case ValueTag.XS_G_MONTH_TAG:
                         case ValueTag.XS_G_YEAR_MONTH_TAG:
                         case ValueTag.XS_G_YEAR_TAG:
+                        case ValueTag.XS_HEX_BINARY_TAG:
+                        case ValueTag.XS_INTEGER_TAG:
+                        case ValueTag.XS_QNAME_TAG:
+                        case ValueTag.XS_STRING_TAG:
+                        case ValueTag.XS_TIME_TAG:
                         case ValueTag.XS_UNTYPED_ATOMIC_TAG:
+                        case ValueTag.XS_YEAR_MONTH_DURATION_TAG:
                             return tid;
 
                         case ValueTag.XS_ANY_ATOMIC_TAG: