[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenonbeta/kdom/xpath
From:       Frans Englich <frans.englich () telia ! com>
Date:       2006-02-01 0:22:24
Message-ID: 1138753344.880175.19380.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 504419 by englich:

Meaningless stuff. Nope, the timezone functions can't be worked on until the \
KDateTime functions are fixed.


 M  +1 -1      environment/OuterFocus.cpp  
 M  +4 -1      functions/TimezoneFNs.cpp  
 M  +1 -1      tests/scratch.xml  


--- trunk/kdenonbeta/kdom/xpath/environment/OuterFocus.cpp #504418:504419
@@ -31,7 +31,7 @@
 /* This is temporary until David Jarvie has extended KDateTime. */
 inline KDateTime nowInUTC()
 {
-    const KDateTime dt(KDateTime::currentDateTime());
+    const KDateTime dt(KDateTime::currentDateTime().toClockTime());
     return KDateTime(dt.date(), dt.time(), KDateTime::OffsetFromUTC, \
dt.UTCOffset());  }
 
--- trunk/kdenonbeta/kdom/xpath/functions/TimezoneFNs.cpp #504418:504419
@@ -94,8 +94,11 @@
             /* "If $arg has a timezone component and $timezone is not the empty \
                sequence,
              * then the result is an xs:dateTime value with a timezone component of
              * $timezone that is equal to $arg." */
-            //dt = dt.toUTC();
+            kdDebug(26560) << "BEGIN: " << dt.toString() << endl;
+            dt = dt.toUTC();
+            kdDebug(26560) << "WHEN IN UTC: " << dt.toString() << endl;
             dt.addSecs(tzSecs);
+            kdDebug(26560) << "AFTER ADDING: " << dt.toString() << endl;
             dt.setTimeSpec(KDateTime::OffsetFromUTC, tzSecs);
             kdDebug(26560) << "dt(FOO): " << dt.toString() << endl;
             Q_ASSERT(dt.isValid());
--- trunk/kdenonbeta/kdom/xpath/tests/scratch.xml #504418:504419
@@ -6,8 +6,8 @@
 	<xi:include href="/home/frans/kde/src/tests/kxpathtests/tests/casting-durations.xml" \
/>  <xi:include href="/home/frans/kde/src/tests/kxpathtests/tests/value-comparisons-durations.xml" \
/>  <xi:include href="/home/frans/kde/src/tests/kxpathtests/tests/functions-datestimes.xml" \
/> +	<xi:include href="/home/frans/kde/src/tests/kxpathtests/tests/casting-generated.xml" \
/>  <xi:include href="/home/frans/kde/src/tests/kxpathtests/tests/functions-timezones.xml" \
                />
-	<xi:include href="/home/frans/kde/src/tests/kxpathtests/tests/casting-generated.xml" \
                />
 	-->
 
 	<test-collection>


[prev in list] [next in list] [prev in thread] [next in thread]