Fix some FIXMEs.

portnov [2009-07-07 06:28:39]
Fix some FIXMEs.
Filename
Blog/Blog.hs
Framework/Forms/HTML.hs
Framework/Forms/Validation.hs
Framework/Pager.hs
Framework/Types.hs
Framework/Urls.hs
Framework/Utils.hs
diff --git a/Blog/Blog.hs b/Blog/Blog.hs
index dd148db..6178910 100644
--- a/Blog/Blog.hs
+++ b/Blog/Blog.hs
@@ -73,7 +73,7 @@ newpost conf = do
                           in do queryListSQL conf (insertM postModel) [ptitle, pbody]
                                 commit conf
                                 invalidatePostsCache conf
-                                return $ redirectG "/blog/" ["code" =: "1"]
+                                return $ redirectG "/blog/" ["code" := "1"]
             Left e -> returnInvalidForm conf postForm "1" e
     where url = myUrl (request conf)

diff --git a/Framework/Forms/HTML.hs b/Framework/Forms/HTML.hs
index 6287309..f5c67b5 100644
--- a/Framework/Forms/HTML.hs
+++ b/Framework/Forms/HTML.hs
@@ -43,7 +43,7 @@ tagToHtml (Tag name attrs value coll) = "<"++name++(concat $ map htmlAttr attrs)
 hiddenField :: String         -- ^ Input name
             -> String         -- ^ Input value
             -> HTMLTag
-hiddenField name value = tag "input" ["name" =: name, "value" =: value, "type" =: "hidden"] []
+hiddenField name value = tag "input" ["name" := name, "value" := value, "type" := "hidden"] []

 -- | Mangle form input name
 mangleName :: String         -- ^ Form name
@@ -54,7 +54,7 @@ mangleName formname fid name = formname++fid++"-"++name

 -- | Render HTML Form
 formToHtml :: HTMLForm -> String
-formToHtml form = tagToHtml $ tag "form" ["method" =: "POST","action" =: (formAction form), "id" =: tagid] $
+formToHtml form = tagToHtml $ tag "form" ["method" := "POST","action" := (formAction form), "id" := tagid] $
       [tag "table" [] $ (visibleFields form) ++ (hiddenFields form) ++ [fidfield, namefield, submit]]
     where fidfield = hiddenField "formid" (formId form)
           namefield = hiddenField "formname" (htmlFormName form)
@@ -71,7 +71,7 @@ formrow fname fid def cls (Field name label widget _) = tag "tr" attrs [tag "td"
                                                                         tag "td" [] [html widget itemname def]]
     where attrs = if null cls
                     then []
-                    else ["class" =: cls]
+                    else ["class" := cls]
           itemlabel = if null label
                         then (capitalize name)++":"
                         else label
@@ -80,7 +80,7 @@ formrow fname fid def cls (Field name label widget _) = tag "tr" attrs [tag "td"
 -- | Form's submit button
 submit :: HTMLTag
 submit = tag "tr" [] [tag "td" [] [],
-                      tag "td" [] [tag "input" ["type" =: "submit"] []]]
+                      tag "td" [] [tag "input" ["type" := "submit"] []]]

 -- | Render field=value
 htmlAttr :: FormVar -> String
diff --git a/Framework/Forms/Validation.hs b/Framework/Forms/Validation.hs
index b67c119..a459a6f 100644
--- a/Framework/Forms/Validation.hs
+++ b/Framework/Forms/Validation.hs
@@ -86,7 +86,7 @@ retryEditForm conf form fid defvals hidden action = do
 returnInvalidForm :: ActionConfig -> Form -> String -> [String] -> IO (Response String)
 returnInvalidForm conf form fid errs =
     do sessionSet conf "filled" values
-       return $ redirectG (myUrl $ request conf) ["invalid" =: (unwords errs)]
+       return $ redirectG (myUrl $ request conf) ["invalid" := (unwords errs)]
     where values = tail $ urlencode $ map packParam vars
           vars = formVars form fid (request conf)
 isRight :: Either t1 t -> Bool
diff --git a/Framework/Pager.hs b/Framework/Pager.hs
index a9a0d5c..c0bf638 100644
--- a/Framework/Pager.hs
+++ b/Framework/Pager.hs
@@ -48,17 +48,17 @@ genericPager pg conf perpage q params model = do

 -- | Simple pager HTML generator
 genpager :: Pager
-genpager rq pages page = tagToHtml $ tag "p" ["class" =: "pager"] (firstlink++prevlink++(map onepage pagelist)++nextlink++lastlink)
+genpager rq pages page = tagToHtml $ tag "p" ["class" := "pager"] (firstlink++prevlink++(map onepage pagelist)++nextlink++lastlink)
     where
       pagelist = [1..pages]
       onepage n | n==page   = tag "span" [] [Text $ show n]
-                | otherwise = tag "a" ["href" =: (pagelink n)] [Text $show n]
+                | otherwise = tag "a" ["href" := (pagelink n)] [Text $show n]
       pagelink m = httpAddGetVar rq "page" (show m)
       prevlink | page==1   = []
-               | otherwise = [tag "a" ["href" =: (pagelink $ page-1)] [Text "&lt;"]]
+               | otherwise = [tag "a" ["href" := (pagelink $ page-1)] [Text "&lt;"]]
       nextlink | page==pages = []
-               | otherwise   = [tag "a" ["href" =: (pagelink $ page+1)] [Text "&gt;"]]
+               | otherwise   = [tag "a" ["href" := (pagelink $ page+1)] [Text "&gt;"]]
       firstlink | page==1 = []
-                | otherwise = [tag "a" ["href" =: (pagelink 1)] [Text "&lt;&lt;"]]
+                | otherwise = [tag "a" ["href" := (pagelink 1)] [Text "&lt;&lt;"]]
       lastlink | page==pages = []
-               | otherwise   = [tag "a" ["href" =: (pagelink pages)] [Text "&gt;&gt;"]]
+               | otherwise   = [tag "a" ["href" := (pagelink pages)] [Text "&gt;&gt;"]]
diff --git a/Framework/Types.hs b/Framework/Types.hs
index 5cce8ab..7fc2ca7 100644
--- a/Framework/Types.hs
+++ b/Framework/Types.hs
@@ -58,15 +58,11 @@ data ActionConfig = ActionConfig {
 data UrlParam = String := String
 type FormVar = UrlParam

--- FIXME: remove this doubt operator :)
-(=:) :: String -> String -> UrlParam
-name =: value = name := value
-
 repackHeader :: Header -> (String,String)
 repackHeader hdr = (show $ hdrName hdr, hdrValue hdr)

 packParam :: (String,String) -> UrlParam
-packParam (n,v) = (n =: v)
+packParam (n,v) = (n := v)

 -------------------------------------------------------------------------------------------

diff --git a/Framework/Urls.hs b/Framework/Urls.hs
index acd9242..ca4502e 100644
--- a/Framework/Urls.hs
+++ b/Framework/Urls.hs
@@ -8,8 +8,6 @@ import Data.Char
 import Codec.Binary.UTF8.String
 import Text.Regex.PCRE
 import Network.URI
--- FIXME!
-import Network.Shed.Httpd(queryToArguments)
 import Network.HTTP
 import Data.List

@@ -18,6 +16,7 @@ import Framework.Types
 import Framework.Wrapper
 import qualified Framework.Http.Sessions as Sessions
 import Framework.Http.Response ((<+>))
+import Framework.Http.Httpd (queryToArguments)

 type URLParts = [String]
 -- | Function which get one String argument and (maybe) returns Response
diff --git a/Framework/Utils.hs b/Framework/Utils.hs
index c8dd190..b383d59 100644
--- a/Framework/Utils.hs
+++ b/Framework/Utils.hs
@@ -12,9 +12,8 @@ import System.Locale
 import Codec.Binary.UTF8.String
 import Network.URI
 import Network.HTTP
--- ! FIXME
-import Network.Shed.Httpd (queryToArguments)

+import Framework.Http.Httpd (queryToArguments)
 import Framework.Types

 mimes = M.fromList [
ViewGit