Many bugfixes

[Lucu.git] / examples / Multipart.hs

diff --git a/examples/Multipart.hs b/examples/Multipart.hs
index 9c42e7269a4984452d8914aea1644ba02891f1eb..8ddc6189be39a8ad942d372671819fd6f066e53f 100644 (file)
--- a/examples/Multipart.hs
+++ b/examples/Multipart.hs
@@ -21,21 +21,21 @@ resMain ∷ ResourceDef
 resMain 
     = emptyResource {
         resGet
-          = Just $ do setContentType $ mkMIMEType "text" "html"
-                      output ("<title>Multipart Form Test</title>\n" ⊕
-                              "<form action=\"/\" method=\"post\" enctype=\"multipart/form-data\">\n" ⊕
-                              "  Upload some file:\n" ⊕
-                              "  <input type=\"text\" name=\"text\">\n" ⊕
-                              "  <input type=\"file\" name=\"file\">\n" ⊕
-                              "  <input type=\"submit\" value=\"Submit\">\n" ⊕
-                              "</form>\n")
+          = Just $ do setContentType $ parseMIMEType "text/html"
+                      putChunks $ "<title>Multipart Form Test</title>\n"
+                                ⊕ "<form action=\"/\" method=\"post\" enctype=\"multipart/form-data\">\n"
+                                ⊕ "  Upload some file:\n"
+                                ⊕ "  <input type=\"text\" name=\"text\">\n"
+                                ⊕ "  <input type=\"file\" name=\"file\">\n"
+                                ⊕ "  <input type=\"submit\" value=\"Submit\">\n"
+                                ⊕ "</form>\n"
       , resPost
-          = Just $ do form ← inputForm defaultLimit
+          = Just $ do form ← getForm Nothing
                       let text     = fromMaybe (∅) $ fdContent <$> lookup "text" form
                           file     = fromMaybe (∅) $ fdContent <$> lookup "file" form
                           fileName = fdFileName =≪ lookup "file" form
-                      setContentType $ mkMIMEType "text" "plain"
-                      outputChunk ("You entered \"" ⊕ text ⊕ "\".\n")
-                      outputChunk ("You uploaded a " ⊕ Lazy.pack (show $ Lazy.length file) ⊕ " bytes long file.\n")
-                      output ("The file name is " ⊕ Lazy.pack (show fileName) ⊕ ".\n")
+                      setContentType $ parseMIMEType "text/plain"
+                      putChunks $ "You entered \"" ⊕ text ⊕ "\".\n"
+                      putChunks $ "You uploaded a " ⊕ Lazy.pack (show $ Lazy.length file) ⊕ " bytes long file.\n"
+                      putChunks $ "The file name is " ⊕ Lazy.pack (show fileName) ⊕ ".\n"
       }