Merge lp:~zorba-coders/zorba/bug-988412 into lp:zorba

[Matthias Brantner]

fix for bug #988412 (date:current-dateTime daylight saving)

fix for bug #988412 (date:current-dateTime daylight saving)

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-988412-2012-04-25T17-54-01.991Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-988412-2012-04-25T17-54-01.991Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve, 1 Pending.

[William Candillon (wcandillon)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-988412-2012-04-25T18-40-21.164Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-988412-2012-04-25T18-40-21.164Z is finished. The final status was:

All tests succeeded!

=== modified file 'ChangeLog'
--- ChangeLog	2012-04-24 12:39:38 +0000
+++ ChangeLog	2012-04-25 17:27:26 +0000
@@ -30,6 +30,7 @@
   * Fixed performance problem with the findNodeSources function of the no-copy rule
   * Fixed bug #872234 (prevent a rewritting to take place in case of sequential expr)
   * Fixed bug #906494 (default compile with D_FILE_OFFSET_BITS=64)
+  * Fixed bug #988412 (date:current-dateTime daylight saving)
   * Fixed bug #912586, #912593 and #912722 (assertion failures with lax validation)
   * Fixed bug #921458 (file:read-text-lines() blocking)
   * Fixed bug #981405 (do not hoist expr containing try-catch variables out of the

=== modified file 'modules/com/zorba-xquery/www/modules/datetime.xq.src/datetime.cpp'
--- modules/com/zorba-xquery/www/modules/datetime.xq.src/datetime.cpp	2012-04-24 12:39:38 +0000
+++ modules/com/zorba-xquery/www/modules/datetime.xq.src/datetime.cpp	2012-04-25 17:27:26 +0000
@@ -32,21 +32,23 @@
     long&           timezone,
     unsigned short& millitm)
 {
+  int lSummerTimeShift = 0;
 #if defined (WIN32)
   struct _timeb timebuffer;
   _ftime_s( &timebuffer );
   localtime_s(&gmtm, &timebuffer.time); //thread safe localtime on Windows
+  lSummerTimeShift = -timebuffer.timezone * 60;
+  if (gmtm.tm_isdst != 0)
+    lSummerTimeShift += 3600;
 #else
   struct timeb timebuffer;
   ftime( &timebuffer );
   localtime_r(&timebuffer.time, &gmtm); //thread safe localtime on Linux
+  localtime_r(&timebuffer.time, &gmtm); //thread safe localtime on Linux
+  lSummerTimeShift = gmtm.tm_gmtoff;
 #endif
 
-  int lSummerTimeShift = 0;
-  if (gmtm.tm_isdst != 0)
-    lSummerTimeShift = 3600;
-
-  timezone = -timebuffer.timezone * 60 + lSummerTimeShift; // in seconds
+  timezone = lSummerTimeShift; // in seconds
   millitm = timebuffer.millitm;
 }