Exodus to GHC 6.8.1

[Rakka.git] / Rakka / Utils.hs

diff --git a/Rakka/Utils.hs b/Rakka/Utils.hs
index 9f2873c9ae328d626d9679b2ac0c777750c1e50e..f58a0b8a30340070dfc0c9b715371fedfb75cdb8 100644 (file)
--- a/Rakka/Utils.hs
+++ b/Rakka/Utils.hs
@@ -10,7 +10,7 @@ module Rakka.Utils
 
 import           Control.Arrow
 import           Control.Arrow.ArrowList
-import           System.Time
+import           Data.Time
 import           Text.Printf
 
 
@@ -42,33 +42,43 @@ deleteIfEmpty
                        _  -> returnA -< str
 
 
-formatW3CDateTime :: CalendarTime -> String
-formatW3CDateTime time
-    = formatDateTime time ++ formatTimeZone time
+formatW3CDateTime :: ZonedTime -> String
+formatW3CDateTime zonedTime
+    = formatLocalTime (zonedTimeToLocalTime zonedTime)
+      ++
+      formatTimeZone (zonedTimeZone zonedTime)
     where
-      formatDateTime :: CalendarTime -> String
-      formatDateTime time
-          = printf "%04d-%02d-%02dT%02d:%02d:%02d"
-            (ctYear time)
-            (fromEnum (ctMonth time) + 1)
-            (ctDay  time)
-            (ctHour time)
-            (ctMin  time)
-            (ctSec  time)
+      formatLocalTime :: LocalTime -> String
+      formatLocalTime localTime
+          = let (year, month, day) = toGregorian (localDay localTime)
+                timeOfDay          = localTimeOfDay localTime
+                (secInt, secFrac)  = properFraction (todSec timeOfDay)
+            in
+              (printf "%04d-%02d-%02dT%02d:%02d:%02d"
+                      year
+                      month
+                      day
+                      (todHour timeOfDay)
+                      (todMin timeOfDay)
+                      (secInt :: Int))
+              ++
+              (if secFrac == 0
+               then ""
+               else tail (show secFrac))
       
-      formatTimeZone :: CalendarTime -> String
-      formatTimeZone time
-          = case ctTZ time
-            of offset | offset <  0 -> '-':(showTZ $ negate offset)
-                      | offset == 0 -> "Z"
-                      | otherwise   -> '+':(showTZ offset)
+      formatTimeZone :: TimeZone -> String
+      formatTimeZone tz
+          = case timeZoneMinutes tz of
+              offset | offset <  0 -> '-':(showTZ $ negate offset)
+                     | offset == 0 -> "Z"
+                     | otherwise   -> '+':(showTZ offset)
       
       showTZ :: Int -> String   
       showTZ offset
-          = let hour = offset `div` 3600
-                min  = (offset - hour * 3600) `div` 60
+          = let hour   = offset `div` 60
+                minute = offset - hour * 60
             in 
-              show2 hour ++ ":" ++ show2 min
+              show2 hour ++ ":" ++ show2 minute
             
       show2 :: Int -> String
       show2 n | n < 10    = '0':(show n)