[Fencommits] fenserve: move unsafeGetW3CTime to PagePrelude

[Benja Fallenstein]

Thu Mar 29 16:39:27 EEST 2007  Benja Fallenstein <benja.fallenstein at gmail.com>
  * move unsafeGetW3CTime to PagePrelude
diff -rN -u old-fenserve/FenServe.hs new-fenserve/FenServe.hs
--- old-fenserve/FenServe.hs	2007-03-29 16:40:11.000000000 +0300
+++ new-fenserve/FenServe.hs	2007-03-29 16:40:11.000000000 +0300
@@ -54,7 +54,6 @@
 import System.IO
 import System.IO.Unsafe (unsafePerformIO)
 import qualified System.Plugins as Plugins
-import System.Time
 
 fs                 =     "http://fenfire.org/2007/fenserve#"
 fs_Directory       = IRI "http://fenfire.org/2007/fenserve#Directory"
@@ -327,21 +326,6 @@
     return h
 
 
--------------------------------------------------------------------------
--- Unsafe function for getting current time as a literal
--- -- this shouldn't be here, just needs to be accessible from pages
--------------------------------------------------------------------------
-
-unsafeGetW3CTime () = Literal (iso8601 y (fromEnum mo + 1) d h m s) Plain where
-    time = unsafePerformIO $ getClockTime -- XXX
-    CalendarTime y mo d h m s ps wd yd tzn tz isDST = toUTCTime $ time 
-
-iso8601 y mo d h m s =
-    let  p n i = take (n - length (show i)) (repeat '0') ++ show i
-    in   p 4 y ++ '-':p 2 mo ++ '-':p 2 d ++
-     'T':p 2 h ++ ':':p 2  m ++ ':':p 2 s ++ ['Z']
-    
-
 --------------------------------------------------------------------------
 -- Copied from HAppS.Protocols.SimpleHTTP2, which is BSD3-licensed
 --------------------------------------------------------------------------
diff -rN -u old-fenserve/PagePrelude.hs new-fenserve/PagePrelude.hs
--- old-fenserve/PagePrelude.hs	2007-03-29 16:40:11.000000000 +0300
+++ new-fenserve/PagePrelude.hs	2007-03-29 16:40:11.000000000 +0300
@@ -23,9 +23,13 @@
 
 import Storm
 import FenServe
+import Fenfire.RDF
 
 import Data.Maybe (fromMaybe)
 
+import System.Time
+import System.IO.Unsafe
+
 
 pageHandler :: HTML -> Handler
 pageHandler html _request = 
@@ -77,3 +81,17 @@
 instance ToXML a => ToXML [a] where
     toXMLs = HTML . concatMap (unHTML . toXMLs)
 
+
+-------------------------------------------------------------------------
+-- Unsafe function for getting current time as a literal
+-------------------------------------------------------------------------
+
+unsafeGetW3CTime () = Literal (iso8601 y (fromEnum mo + 1) d h m s) Plain where
+    time = unsafePerformIO $ getClockTime -- XXX
+    CalendarTime y mo d h m s ps wd yd tzn tz isDST = toUTCTime $ time 
+
+iso8601 y mo d h m s =
+    let  p n i = take (n - length (show i)) (repeat '0') ++ show i
+    in   p 4 y ++ '-':p 2 mo ++ '-':p 2 d ++
+     'T':p 2 h ++ ':':p 2  m ++ ':':p 2 s ++ ['Z']
+