fix examples

deian · Jun 16, 2013 · 424f6e4 · 424f6e4
1 parent d139403
commit 424f6e4
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/examples/SimpleFrank.hs b/examples/SimpleFrank.hs
@@ -14,7 +14,7 @@ server :: Application
 server = mkRouter $ do
   routeTop (redirectTo "/users")
   Frank.get "/users" $ do
-    req <- request >>= unlabel
+    req <- request >>= liftLIO . unlabel
     return $ okHtml $ fromString $
       "Welcome to " ++ (show $ serverName req) ++
       "<br/>Go to url: /users/:id/"

diff --git a/examples/SimpleFullExample/SimpleApp.hs b/examples/SimpleFullExample/SimpleApp.hs
@@ -33,5 +33,5 @@ server _ lreq = do
     [] -> return $ "Welcome to the simple key-value store!\n" ++ use
     _ -> return $ "Unrecognized query. Expecting:\n" ++ use
   return $ Response ok200 [] (L8.pack resp)
-    where use = " Insert: /insert?key1=val1,key2=val2,..\n"
-             ++ " Fetch:  /fetch?key1,key2\n"
+    where use = " Insert: /insert?key1=val1&key2=val2&..\n"
+             ++ " Fetch:  /fetch?key1&key2\n"
diff --git a/examples/SimpleFullExample/SimplePolicyModule.hs b/examples/SimpleFullExample/SimplePolicyModule.hs
@@ -27,19 +27,19 @@ instance PolicyModule StorePolicyModule where
   initPolicyModule priv = do
     setPolicy priv $ do
       database $ do
-        readers ==> anybody
-        writers ==> anybody
+        readers ==> unrestricted
+        writers ==> unrestricted
         admins  ==> this
       collection "store" $ do
         access $ do
-          readers ==> anybody
-          writers ==> anybody
+          readers ==> unrestricted
+          writers ==> unrestricted
         clearance $ do
           secrecy   ==> this
-          integrity ==> anybody
+          integrity ==> unrestricted
         document $ \_ -> do
-          readers ==> anybody
-          writers ==> anybody
+          readers ==> unrestricted
+          writers ==> unrestricted
         field "key" key
     return $ StorePolicyModuleTCB priv
       where this = privDesc priv

diff --git a/examples/SimpleParams.hs b/examples/SimpleParams.hs
@@ -10,9 +10,9 @@ import           Hails.Data.Hson
 
 server :: Application
 server _ lreq = do
-  req <- unlabel lreq
+  req <- liftLIO $ unlabel lreq
   ldoc <- labeledRequestToHson lreq
-  doc <- unlabel ldoc
+  doc <- liftLIO $ unlabel ldoc
   return $ case pathInfo req of
     ("login":_) -> Response temporaryRedirect307 
                             [("x-hails-login",""),(hLocation,"/")] ""

diff --git a/examples/SimpleREST.hs b/examples/SimpleREST.hs
@@ -15,7 +15,7 @@ server = mkRouter $ do
   routeTop (redirectTo "/users")
   routeName "users" $ do
     REST.index $ do
-      req <- request >>= unlabel
+      req <- request >>= liftLIO . unlabel
       return $ okHtml $ fromString $
         "Welcome to " ++ (show $ serverName req) ++
         "<br/>Go to url: /users/:id/"