[build fixes for latest happstack et al.
Jeremy Shaw <jeremy@seereason.com>**20110707003352
 Ignore-this: 76c0af1418f0684f42149e487c0fd285
] hunk ./Types.hs 9
-import qualified Data.Text.Encoding as Text
+-- import qualified Data.Text.Encoding as Text
hunk ./Types.hs 109
-
+{-
hunk ./Types.hs 114
-
+-}
hunk ./Web.hs 23
-import Happstack.Server (ServerMonad, ServerPartT, FilterMonad, FilterFun, WebMonad, Method(GET, POST), Response, Request(..),asContentType, askRq, badRequest, composeFilter, internalServerError, mapServerPartT, methodM, notFound, ok, seeOther, serveFile, toResponse, mkCookie, addCookie)
+import Happstack.Server -- (ServerMonad, ServerPartT, FilterMonad, FilterFun, WebMonad, Method(GET, POST), Response, Request(..),asContentType, askRq, badRequest, composeFilter, internalServerError, mapServerPartT, methodM, notFound, ok, seeOther, serveFile, toResponse, mkCookie, addCookie)
hunk ./Web.hs 45
-import Web.Routes (RouteT,PathInfo(toPathSegments, fromPathSegments), Site(Site,handleSite, parsePathSegments, formatPathSegments), ShowURL(showURL), unRouteT, URL, Link, segment, anySegment, setDefault, withRouteT, parseSegments, pathInfoInverse_prop, mapRouteT)
+import Web.Routes (RouteT,PathInfo(toPathSegments, fromPathSegments), Site(Site,handleSite, parsePathSegments, formatPathSegments), ShowURL, showURL, unRouteT, URL, Link, segment, anySegment, setDefault, withRouteT, parseSegments, pathInfoInverse_prop, mapRouteT, mkSitePI, runRouteT)
hunk ./Web.hs 48
-import Web.Routes.MTL ()
hunk ./Web.hs 145
-
-instance (Functor m, Monad m) => EmbedAsChild (RouteT url m) (HJScript ()) where
-  asChild script = asChild . snd $ evalHJScript script
-
-instance (Functor m, Monad m) => EmbedAsChild (RouteT url m) (Block t) where
-  asChild b = asChild $
-    <script type="text/javascript">
-      <% show b %>
-    </script>
-
hunk ./Web.hs 154
+    , HasRqData m
hunk ./Web.hs 157
+
hunk ./Web.hs 164
-                mediaJS <- imageToggles media --  :: RouteT WebURL m [HJScript (Exp JQuery)]
-                toResponse <$> (unXMLGenT $ boardTemplate here (Right (boardName, maxPageNum)) (Text.unpack (unBoardName boardName)) (ready' mediaJS)  <% mapM threadHTML threads %>)
+--                mediaJS <- imageToggles media --  :: RouteT WebURL m [HJScript (Exp JQuery)]
+                toResponse <$> (unXMLGenT $ boardTemplate here (Right (boardName, maxPageNum)) (Text.unpack (unBoardName boardName)) () {- (ready' mediaJS)  -} <% mapM threadHTML threads %>)
hunk ./Web.hs 196
-             addCookie (-1) (mkCookie "secret" (show i))
-             addCookie (-1) (mkCookie "role" (show role))
+             addCookie Session (mkCookie "secret" (show i))
+             addCookie Session (mkCookie "role" (show role))
hunk ./Web.hs 219
-    withRouteT (\f -> \url -> -- authURL appSecret userSecret f url
-                    let link = (f url)
+    withRouteT (\f -> \url params -> -- authURL appSecret userSecret f url
+                    let link = (f url params)
hunk ./Web.hs 239
+    , HasRqData m
hunk ./Web.hs 265
-             
+
hunk ./Web.hs 343
+    , HasRqData m
hunk ./Web.hs 346
-    , EmbedAsChild m (HJScript ())
+--    , EmbedAsChild m (HJScript ())
hunk ./Web.hs 476
+    , HasRqData m
hunk ./Web.hs 484
-               Site { handleSite  = \f u -> unRouteT (authWeb u) f
-                    , formatPathSegments  = toPathSegments
-                    , parsePathSegments   = parseSegments fromPathSegments
-                    }
+               mkSitePI (runRouteT authWeb)
+
hunk ./Web.hs 489
-    msum [ mzero -- do withDataFn ask $ \formData -> do askRq >>= \rq -> liftIO (print (rqBody rq)) ; liftIO (print formData) ; mzero
-          , toIO config $ implSite {- (uriToString id (connectURL facebookConfig) "") -} "/" "web/" webSpec
-         ]
+    do decodeBody (defaultBodyPolicy "/tmp/" (2*10^6) 10000 10000)
+       msum [ mzero -- do withDataFn ask $ \formData -> do askRq >>= \rq -> liftIO (print (rqBody rq)) ; liftIO (print formData) ; mzero
+            , toIO config $ implSite {- (uriToString id (connectURL facebookConfig) "") -} "/" "web/" webSpec
+            ]
hunk ./Web.hs 497
-      f :: ConfigT m (Maybe (Either Response a, FilterFun Response)) -> m (Maybe (Either Response a, FilterFun Response))
+--      f :: ConfigT m (Maybe (Either Response a, FilterFun Response)) -> m (Maybe (Either Response a, FilterFun Response))
hunk ./Web.hs 499
-
+{-
hunk ./Web.hs 505
+    , HasRqData m
+    , MonadIO m
hunk ./Web.hs 518
+-}
hunk ./Web.hs 615
+
hunk ./imageboard.cabal 43
+                   happstack-hsp,
hunk ./imageboard.cabal 54
-                   web-routes,
+                   web-routes >= 0.25,