slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

web: remove url encoding/decoding that seems out of place

Browse Source
This commit is contained in:
Simon Michael 2010-05-23 21:48:32 +00:00
parent 91b7736a8b
commit 131ec1e1f1
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Hledger/Cli/Commands/Web.hs
View File

@ -13,7 +13,6 @@ import Control.Applicative.Error (Failing(Success,Failure))
import Control.Concurrent import Control.Concurrent
import Control.Monad.Reader (ask) import Control.Monad.Reader (ask)
import Data.IORef (newIORef, atomicModifyIORef) import Data.IORef (newIORef, atomicModifyIORef)
import Network.HTTP (urlEncode, urlDecode)
import System.Directory (getModificationTime) import System.Directory (getModificationTime)
import System.IO.Storage (withStore, putValue, getValue) import System.IO.Storage (withStore, putValue, getValue)
import System.Time (ClockTime, getClockTime, diffClockTimes, TimeDiff(TimeDiff)) import System.Time (ClockTime, getClockTime, diffClockTimes, TimeDiff(TimeDiff))
@ -87,7 +86,7 @@ server opts args j =
let a = intercalate "+" $ reqparam env "a" let a = intercalate "+" $ reqparam env "a"
p = intercalate "+" $ reqparam env "p" p = intercalate "+" $ reqparam env "p"
opts' = opts ++ [Period p] opts' = opts ++ [Period p]
args' = args ++ (map urlDecode $ words a) args' = args ++ words a
j' <- fromJust `fmap` getValue "hledger" "journal" j' <- fromJust `fmap` getValue "hledger" "journal"
j'' <- journalReloadIfChanged opts' args' j' j'' <- journalReloadIfChanged opts' args' j'
-- declare path-specific request handlers -- declare path-specific request handlers
@ -214,7 +213,7 @@ navlinks :: Hack.Env -> HSP XML
navlinks _ = do navlinks _ = do
a <- getParamOrNull "a" a <- getParamOrNull "a"
p <- getParamOrNull "p" p <- getParamOrNull "p"
let addparams=(++(printf "?a=%s&p=%s" (urlEncode a) (urlEncode p))) let addparams=(++(printf "?a=%s&p=%s" a p))
link s = <a href=(addparams s) class="navlink"><% s %></a> link s = <a href=(addparams s) class="navlink"><% s %></a>
<div id="navlinks"> <div id="navlinks">
<% link "transactions" %> | <% link "transactions" %> |