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/07/12 04:38:06 UTC

svn commit: r1360514 - in /incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/datamodel: api/IDate.java api/ITime.java api/ITimezone.java util/DateTime.java

Author: prestonc
Date: Thu Jul 12 02:38:06 2012
New Revision: 1360514

URL: http://svn.apache.org/viewvc?rev=1360514&view=rev
Log:
The update contains a new function to apply the timezone to a date, datetime or time pointable through a timezone interface.

Added:
    incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/datamodel/api/ITimezone.java   (with props)
Modified:
    incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/datamodel/api/IDate.java
    incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/datamodel/api/ITime.java
    incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/datamodel/util/DateTime.java

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/datamodel/api/IDate.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/datamodel/api/IDate.java?rev=1360514&r1=1360513&r2=1360514&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/datamodel/api/IDate.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/datamodel/api/IDate.java Thu Jul 12 02:38:06 2012
@@ -7,12 +7,6 @@ public interface IDate {
 
     public long getDay();
 
-    public long getTimezoneHour();
-
-    public long getTimezoneMinute();
-
-    public long getTimezone();
-
     public long getYearMonth();
 
     public long getDayTime();

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/datamodel/api/ITime.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/datamodel/api/ITime.java?rev=1360514&r1=1360513&r2=1360514&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/datamodel/api/ITime.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/datamodel/api/ITime.java Thu Jul 12 02:38:06 2012
@@ -7,12 +7,6 @@ public interface ITime {
 
     public long getMilliSecond();
 
-    public long getTimezoneHour();
-
-    public long getTimezoneMinute();
-
-    public long getTimezone();
-
     public long getDayTime();
 
 }

Added: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/datamodel/api/ITimezone.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/datamodel/api/ITimezone.java?rev=1360514&view=auto
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/datamodel/api/ITimezone.java (added)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/datamodel/api/ITimezone.java Thu Jul 12 02:38:06 2012
@@ -0,0 +1,14 @@
+package org.apache.vxquery.datamodel.api;
+
+public interface ITimezone {
+    public long getTimezoneHour();
+
+    public long getTimezoneMinute();
+
+    public long getTimezone();
+
+    public long getYearMonth();
+
+    public long getDayTime();
+
+}

Propchange: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/datamodel/api/ITimezone.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/datamodel/util/DateTime.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/datamodel/util/DateTime.java?rev=1360514&r1=1360513&r2=1360514&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/datamodel/util/DateTime.java (original)
+++ incubator/vxquery/branches/vxquery_algebricks/vxquery-core/src/main/java/org/apache/vxquery/datamodel/util/DateTime.java Thu Jul 12 02:38:06 2012
@@ -1,6 +1,13 @@
 package org.apache.vxquery.datamodel.util;
 
+import java.io.DataOutput;
+import java.io.IOException;
+
+import org.apache.vxquery.context.DynamicContext;
+import org.apache.vxquery.datamodel.accessors.atomic.XSDatePointable;
 import org.apache.vxquery.datamodel.accessors.atomic.XSDateTimePointable;
+import org.apache.vxquery.datamodel.api.ITimezone;
+import org.apache.vxquery.datamodel.values.ValueTag;
 
 public class DateTime {
     public static final long[] DAYS_OF_MONTH_ORDI = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
@@ -50,11 +57,8 @@ public class DateTime {
 
     /**
      * Return a normalized time.
-     * 
-     * @param year
-     * @return
      */
-    public static void normalizeDateTime(byte[] bytes, int start, long yearMonth, long dayTime) {
+    public static void normalizeDateTime(long yearMonth, long dayTime, DataOutput dOut) throws Exception {
         long[] monthDayLimits;
 
         long day = dayTime / CHRONON_OF_DAY;
@@ -92,7 +96,35 @@ public class DateTime {
             }
             monthDayLimits = (isLeapYear(year) ? DateTime.DAYS_OF_MONTH_LEAP : DateTime.DAYS_OF_MONTH_ORDI);
         }
-        XSDateTimePointable.setDateTime(bytes, 0, year, month, day, hour, minute, millisecond, 0, 0);
+        dOut.write(ValueTag.XS_DATETIME_TAG);
+        dOut.writeShort((short) year);
+        dOut.writeByte((byte) month);
+        dOut.writeByte((byte) day);
+        dOut.writeByte((byte) hour);
+        dOut.writeByte((byte) minute);
+        dOut.writeInt((int) millisecond);
+        dOut.writeByte((byte) DateTime.TIMEZONE_HOUR_NULL);
+        dOut.writeByte((byte) DateTime.TIMEZONE_MIN_NULL);
+    }
+
+    public static void getTimezoneDateTime(ITimezone timezonep, DynamicContext dCtx, DataOutput dOut)
+            throws Exception {
+        long timezoneHour;
+        long timezoneMinute;
+        // Consider time zones.
+        if (timezonep.getTimezoneHour() == DateTime.TIMEZONE_HOUR_NULL
+                || timezonep.getTimezoneMinute() == DateTime.TIMEZONE_MIN_NULL) {
+            XSDateTimePointable defaultTimezone = new XSDateTimePointable();
+            dCtx.getCurrentDateTime(defaultTimezone);
+            timezoneHour = defaultTimezone.getTimezoneHour();
+            timezoneMinute = defaultTimezone.getTimezoneMinute();
+        } else {
+            timezoneHour = timezonep.getTimezoneHour();
+            timezoneMinute = timezonep.getTimezoneMinute();
+        }
+        long dayTime = timezonep.getDayTime() + timezoneHour * DateTime.CHRONON_OF_HOUR + timezoneMinute
+                * DateTime.CHRONON_OF_HOUR;
+        DateTime.normalizeDateTime(timezonep.getYearMonth(), dayTime, dOut);
     }
 
 }