hledger 0.12.1 → 0.13

raw patch · 40 files changed

+1544/−7621 lines, 40 filesdep +haskelinedep −Chartdep −colourdep −convertible-textdep ~hledger-libdep ~processPVP ok

version bump matches the API change (PVP)

Dependencies added: haskeline

Dependencies removed: Chart, colour, convertible-text, data-object, failure, gtk2hs-buildtools, hamlet, io-storage, vty, yesod

Dependency ranges changed: hledger-lib, process

API changes (from Hackage documentation)

Files

• CONTRIBUTORS.rst +0/−72
• DEVELOPMENT.rst +0/−100
• Hledger/Cli/Add.hs +251/−0
• Hledger/Cli/Balance.hs +213/−0
• Hledger/Cli/Commands.hs +40/−0
• Hledger/Cli/Commands/Add.hs +0/−201
• Hledger/Cli/Commands/All.hs +0/−67
• Hledger/Cli/Commands/Balance.hs +0/−213
• Hledger/Cli/Commands/Chart.hs +0/−108
• Hledger/Cli/Commands/Convert.hs +0/−387
• Hledger/Cli/Commands/Histogram.hs +0/−50
• Hledger/Cli/Commands/Print.hs +0/−43
• Hledger/Cli/Commands/Register.hs +0/−207
• Hledger/Cli/Commands/Stats.hs +0/−84
• Hledger/Cli/Commands/Vty.hs +0/−379
• Hledger/Cli/Commands/Web.hs +0/−890
• Hledger/Cli/Convert.hs +390/−0
• Hledger/Cli/Histogram.hs +50/−0
• Hledger/Cli/Main.hs +12/−32
• Hledger/Cli/Options.hs +81/−104
• Hledger/Cli/Print.hs +43/−0
• Hledger/Cli/Register.hs +207/−0
• Hledger/Cli/Stats.hs +84/−0
• Hledger/Cli/Tests.hs +69/−52
• Hledger/Cli/Utils.hs +29/−13
• Hledger/Cli/Version.hs +41/−38
• MANUAL.markdown +0/−1121
• NEWS.markdown +0/−453
• README.rst +0/−34
• data/sample.journal +0/−40
• data/sample.rules +0/−17
• data/sample.timelog +0/−6
• data/web/static/dhtmlxcombo.js +0/−1359
• data/web/static/dhtmlxcommon.js +0/−940
• data/web/static/hledger.js +0/−138
• data/web/static/images/combo_select.gif binary
• data/web/static/jquery.js +0/−154
• data/web/static/jquery.url.js +0/−1
• data/web/static/style.css +0/−226
• hledger.cabal +34/−92

@@ -1,72 +0,0 @@-----title: hledger Contributor List and Agreement-----hledger Contributor List and Agreement-======================================--hledger Contributors----------------------hledger is brought to you by:--- Simon Michael - lead developer, project manager, general dogsbody-- Sergey Astanin - utf8 support-- Nick Ingolia - parser improvements-- Roman Cheplyaka - "chart" command, "add" command improvements-- Michael Snoyman - some additions to the Yesod web interface--Developers who have not yet signed the contributor agreement:--- Tim Docker - parser improvements-- Marko Kocić - hlint cleanup-- Oliver Braun - GHC 6.12 compatibility-- Gwern Branwen - cleanups--Also:--- John Wiegley - created the original ledger program--.. raw:: html-- <br>--------.. raw:: html-- <br>--hledger Contributor Agreement-------------------------------This is the official contributor agreement (v1) and contributor list-for the hledger project. If you have contributed non-trivial code-changes to hledger, please sign this, to help ensure:--1. that there is a clear legal status and audit trail for the project--2. that you get proper credit for your work--3. that we are able to remain license-compatible with related software-   by updating to newer versions of our license when appropriate-   (eg GPLv2 -> GPLv3)--To "sign", read the conditions below and then send a darcs patch to-`this file`_  adding your name to the Contributor List above.  By so-doing you promise that all of your commits to hledger:--- are free of patent violations or copyright violations, to the best of-  your knowledge--- are released under the hledger project's license_; or are released-  under another compatible license (in which case this must be clearly-  noted); or are public domain--- may be relicensed under official future versions of their license -  at the discretion of the project leader--We don't currently gather paper signatures, but this is a good start.-Feel free to update your entry as your contributions grow!---.. _license:   http://joyful.com/repos/hledger/LICENSE-.. _this file: http://joyful.com//darcsweb/darcsweb.cgi?r=hledger;a=filehistory;f=/CONTRIBUTORS-

@@ -1,100 +0,0 @@-----title: hledger development-----hledger development-===================--**Techie intro**--hledger_ is a remix, in haskell_, of John Wiegley's excellent ledger_ accounting tool.-It reads a plain text journal_ or timelog_ file describing your transactions-and displays reports via command line, curses or web interfaces.--The hledger project aims to produce:--- a practical, accessible, dependable tool for end users-- a useful library and toolbox for finance-minded haskell programmers-- a successful, time-and-money-solvent project within a thriving ecosystem of financial software projects.--hledger is free software by `Simon Michael`_ & `co.`_, released under GNU GPLv3.--**Learn**- news_, manual_, screenshots_, `some extra tips`_--**Download**- ``cabal install hledger``, - or try these ready-to-run binaries_,- or see the `installing docs <MANUAL.html#installing>`_--**Develop**- ``darcs get http://joyful.com/repos/hledger``, - `browse the repo`_, - `hackage page`_, - `hledger haddock docs`_, - benchmark_\/profile_\/heap_\/coverage_ reports,- `developer notes`_-- .. `hledger-lib sourcegraph report`_, - .. `hledger sourcegraph report`_, --.. raw:: html-- <a name="support" />--**Support**--- chat Simon (sm) on the `#ledger`_ irc channel which we share, or `email me`_-- report problems at `bugs.hledger.org <http://bugs.hledger.org>`_ (`grid <http://bugs.hledger.org/grid>`_)-- share and test journal snippets at paste . hledger.org-- .. raw:: html--     <form action="http://groups.google.com/group/hledger/boxsubscribe" >-       join the hledger mail list at <a href="http://list.hledger.org">list.hledger.org</a>. Your email:-       <input type=text name=email><input type=submit name="sub" value="Subscribe">-     </form>--**Related projects**--- John Wiegley's ledger_ inspired hledger, and we try to stay compatible. You can often use both tools on the same journal file.-- Uwe Hollerbach's umm_ is another haskell tool inspired by h/ledger.-- Tim Docker's ledger-reports_ uses hledger as a library to generate `html reports`_. -- I have a few older bits and pieces `here <http://joyful.com/Ledger>`_.--.. raw:: html-- <a href="http://joyful.com/darcsweb/darcsweb.cgi?r=hledger;a=shortlog"><img src=http://joyful.com/repos/hledger/commits.png border=0></a>- <a href="https://www.google.com/analytics/reporting/?reset=1&id=15489822" accesskey="a"></a>---.. _hledger:              README.html-.. _journal:              http://joyful.com/repos/hledger/data/sample.journal-.. _timelog:              http://joyful.com/repos/hledger/data/sample.timelog-.. _command line:         SCREENSHOTS.html#hledger-screen-1-.. _curses:               SCREENSHOTS.html#sshot-.. _web interface:        http://demo.hledger.org-.. _mail list:            http://list.hledger.org-.. _issue tracker:        http://bugs.hledger.org-.. _binaries:             http://hledger.org/binaries/-.. _manual:               MANUAL.html-.. _news:                 NEWS.html-.. _screenshots:          SCREENSHOTS.html-.. _hledger haddock docs: http://hledger.org/api-doc/-.. _hledger-lib sourcegraph report: http://joyful.com/repos/hledger/hledger-lib/SourceGraph/hledger-lib.html-.. _hledger sourcegraph report: http://joyful.com/repos/hledger/SourceGraph/hledger.html-.. _developer notes:      http://joyful.com/darcsweb/darcsweb.cgi?r=hledger;a=plainblob;f=/NOTES-.. _benchmark:            http://hledger.org/profs/latest.bench-.. _profile:              http://hledger.org/profs/latest.prof-.. _heap:                 http://hledger.org/profs/latest.ps-.. _coverage:             http://hledger.org/profs/coverage/hpc_index_fun.html-.. _browse the repo:      http://joyful.com/darcsweb/darcsweb.cgi?r=hledger-.. _email me:             mailto:simon@joyful.com?subject=hledger:-.. _Simon Michael:        http://joyful.com-.. _co.:                  http://hledger.org/CONTRIBUTORS.html-.. _hackage page:         http://hackage.haskell.org/package/hledger-.. _#ledger:              irc://irc.freenode.net/#ledger-.. _haskell:              http://haskell.org-.. _ledger:               http://wiki.github.com/jwiegley/ledger-.. _umm:                  http://www.korgwal.com/umm/-.. _ledger-reports:       http://dockerz.net/repos/ledger-reports-.. _html reports:         http://dockerz.net/software/hledger_report_sample/report.html-.. _some extra tips:      http://podcastle.org/2009/10/09/pc-miniature-38-accounting-for-dragons/

@@ -0,0 +1,251 @@+{-# LANGUAGE CPP #-}+{-| ++A history-aware add command to help with data entry.++-}++module Hledger.Cli.Add+where+import Hledger.Data+import Hledger.Read.JournalReader (someamount)+import Hledger.Cli.Options+import Hledger.Cli.Register (registerReport, registerReportAsText)+#if __GLASGOW_HASKELL__ <= 610+import Prelude hiding (putStr, putStrLn, getLine, appendFile)+import System.IO.UTF8+import System.IO ( stderr )+#else+import System.IO ( stderr, hPutStrLn, hPutStr )+#endif+import System.IO.Error+import Text.ParserCombinators.Parsec+import Hledger.Cli.Utils (readJournalWithOpts)+import qualified Data.Foldable as Foldable (find)+import System.Console.Haskeline (+            InputT, runInputT, defaultSettings, setComplete, getInputLine)+import Control.Monad.Trans (liftIO)+import System.Console.Haskeline.Completion+import qualified Data.Set as Set+import Safe (headMay)+import Control.Exception (throw)+++-- | Read transactions from the terminal, prompting for each field,+-- and append them to the journal file. If the journal came from stdin, this+-- command has no effect.+add :: [Opt] -> [String] -> Journal -> IO ()+add opts args j+    | f == "-" = return ()+    | otherwise = do+  hPutStrLn stderr $+    "Enter one or more transactions, which will be added to your journal file.\n"+    ++"To complete a transaction, enter . when prompted for an account.\n"+    ++"To quit, press control-d or control-c."+  today <- getCurrentDay+  runInteraction j (getAndAddTransactions j opts args today)+        `catch` (\e -> unless (isEOFError e) $ ioError e)+      where f = journalFilePath j++-- | Read a number of transactions from the command line, prompting,+-- validating, displaying and appending them to the journal file, until+-- end of input (then raise an EOF exception). Any command-line arguments+-- are used as the first transaction's description.+getAndAddTransactions :: Journal -> [Opt] -> [String] -> Day -> InputT IO ()+getAndAddTransactions j opts args defaultDate = do+  (t, d) <- getTransaction j opts args defaultDate+  j <- liftIO $ journalAddTransaction j opts t+  getAndAddTransactions j opts args d++-- | Read a transaction from the command line, with history-aware prompting.+getTransaction :: Journal -> [Opt] -> [String] -> Day+                    -> InputT IO (Transaction,Day)+getTransaction j opts args defaultDate = do+  today <- liftIO getCurrentDay+  datestr <- askFor "date" +            (Just $ showDate defaultDate)+            (Just $ \s -> null s || +             isRight (parse (smartdate >> many spacenonewline >> eof) "" $ lowercase s))+  description <- askFor "description" (Just "") Nothing+  let historymatches = transactionsSimilarTo j args description+      bestmatch | null historymatches = Nothing+                | otherwise = Just $ snd $ head historymatches+      bestmatchpostings = maybe Nothing (Just . tpostings) bestmatch+      date = fixSmartDate today $ fromparse $ (parse smartdate "" . lowercase) datestr+      accept x = x == "." || (not . null) x &&+        if NoNewAccts `elem` opts+            then isJust $ Foldable.find (== x) ant+            else True+        where (ant,_,_,_) = groupPostings $ journalPostings j+      getpostingsandvalidate = do+        ps <- getPostings (jContext j) accept bestmatchpostings []+        let t = nulltransaction{tdate=date+                               ,tstatus=False+                               ,tdescription=description+                               ,tpostings=ps+                               }+            retry msg = do+              liftIO $ hPutStrLn stderr $ "\n" ++ msg ++ "please re-enter."+              getpostingsandvalidate+        either retry (return . flip (,) date) $ balanceTransaction Nothing t -- imprecise balancing+  unless (null historymatches) +       (liftIO $ do+         hPutStrLn stderr "Similar transactions found, using the first for defaults:\n"+         hPutStr stderr $ concatMap (\(n,t) -> printf "[%3d%%] %s" (round $ n*100 :: Int) (show t)) $ take 3 historymatches)+  getpostingsandvalidate++-- fragile+-- | Read postings from the command line until . is entered, using any+-- provided historical postings and the journal context to guess defaults.+getPostings :: JournalContext -> (AccountName -> Bool) -> Maybe [Posting] -> [Posting] -> InputT IO [Posting]+getPostings ctx accept historicalps enteredps = do+  let bestmatch | isNothing historicalps = Nothing+                | n <= length ps = Just $ ps !! (n-1)+                | otherwise = Nothing+                where Just ps = historicalps+      defaultaccount = maybe Nothing (Just . showacctname) bestmatch+  account <- askFor (printf "account %d" n) defaultaccount (Just accept)+  if account=="."+    then return enteredps+    else do+      let defaultacctused = Just account == defaultaccount+          historicalps' = if defaultacctused then historicalps else Nothing+          bestmatch' | isNothing historicalps' = Nothing+                     | n <= length ps = Just $ ps !! (n-1)+                     | otherwise = Nothing+                     where Just ps = historicalps'+          defaultamountstr | isJust bestmatch' = Just historicalamountstr+                           | n > 1             = Just balancingamountstr+                           | otherwise         = Nothing+              where+                historicalamountstr = showMixedAmountWithPrecision maxprecision $ pamount $ fromJust bestmatch'+                balancingamountstr  = showMixedAmountWithPrecision maxprecision $ negate $ sumMixedAmountsPreservingHighestPrecision $ map pamount enteredrealps+      amountstr <- askFor (printf "amount  %d" n) defaultamountstr validateamount+      let amount  = fromparse $ runParser (someamount <|> return missingamt) ctx     "" amountstr+          amount' = fromparse $ runParser (someamount <|> return missingamt) nullctx "" amountstr+          defaultamtused = Just (showMixedAmount amount) == defaultamountstr+          historicalps'' = if defaultamtused then historicalps' else Nothing+          commodityadded | c == cwithnodef = Nothing+                         | otherwise       = c+              where c          = maybemixedamountcommodity amount+                    cwithnodef = maybemixedamountcommodity amount'+                    maybemixedamountcommodity = maybe Nothing (Just . commodity) . headMay . amounts+          p = nullposting{paccount=stripbrackets account,+                          pamount=amount,+                          ptype=postingtype account}+      when (isJust commodityadded) $+           liftIO $ hPutStrLn stderr $ printf "using default commodity (%s)" (symbol $ fromJust commodityadded)+      getPostings ctx accept historicalps'' $ enteredps ++ [p]+    where+      n = length enteredps + 1+      enteredrealps = filter isReal enteredps+      showacctname p = showAccountName Nothing (ptype p) $ paccount p+      postingtype ('[':_) = BalancedVirtualPosting+      postingtype ('(':_) = VirtualPosting+      postingtype _ = RegularPosting+      stripbrackets = dropWhile (`elem` "([") . reverse . dropWhile (`elem` "])") . reverse+      validateamount = Just $ \s -> (null s && not (null enteredrealps))+                                   || isRight (runParser (someamount>>many spacenonewline>>eof) ctx "" s)++-- | Prompt for and read a string value, optionally with a default value+-- and a validator. A validator causes the prompt to repeat until the+-- input is valid. May also raise an EOF exception if control-d is pressed.+askFor :: String -> Maybe String -> Maybe (String -> Bool) -> InputT IO String+askFor prompt def validator = do+  l <- fmap (maybe eofErr id)+            $ getInputLine $ prompt ++ maybe "" showdef def ++ ": "+  let input = if null l then fromMaybe l def else l+  case validator of+    Just valid -> if valid input+                   then return input+                   else askFor prompt def validator+    Nothing -> return input+    where+        showdef s = " [" ++ s ++ "]"+        eofErr = throw $ mkIOError eofErrorType "end of input" Nothing Nothing++-- | Append this transaction to the journal's file, and to the journal's+-- transaction list.+journalAddTransaction :: Journal -> [Opt] -> Transaction -> IO Journal+journalAddTransaction j@Journal{jtxns=ts} opts t = do+  let f = journalFilePath j+  appendToJournalFile f $ showTransaction t+  when (Debug `elem` opts) $ do+    putStrLn $ printf "\nAdded transaction to %s:" f+    putStrLn =<< registerFromString (show t)+  return j{jtxns=ts++[t]}++-- | Append data to a journal file; or if the file is "-", dump it to stdout.+appendToJournalFile :: FilePath -> String -> IO ()+appendToJournalFile f s =+    if f == "-"+    then putStr $ sep ++ s+    else appendFile f $ sep++s+    where +      sep = "\n\n"+      -- sep | null $ strip t = ""+      --     | otherwise = replicate (2 - min 2 (length lastnls)) '\n'+      --     where lastnls = takeWhile (=='\n') $ reverse t++-- | Convert a string of journal data into a register report.+registerFromString :: String -> IO String+registerFromString s = do+  now <- getCurrentLocalTime+  l <- readJournalWithOpts [] s+  return $ registerReportAsText opts $ registerReport opts (optsToFilterSpec opts [] now) l+    where opts = [Empty]++-- | Return a similarity measure, from 0 to 1, for two strings.+-- This is Simon White's letter pairs algorithm from+-- http://www.catalysoft.com/articles/StrikeAMatch.html+-- with a modification for short strings.+compareStrings :: String -> String -> Double+compareStrings "" "" = 1+compareStrings (_:[]) "" = 0+compareStrings "" (_:[]) = 0+compareStrings (a:[]) (b:[]) = if toUpper a == toUpper b then 1 else 0+compareStrings s1 s2 = 2.0 * fromIntegral i / fromIntegral u+    where+      i = length $ intersect pairs1 pairs2+      u = length pairs1 + length pairs2+      pairs1 = wordLetterPairs $ uppercase s1+      pairs2 = wordLetterPairs $ uppercase s2+wordLetterPairs = concatMap letterPairs . words+letterPairs (a:b:rest) = [a,b] : letterPairs (b:rest)+letterPairs _ = []++compareDescriptions :: [Char] -> [Char] -> Double+compareDescriptions s t = compareStrings s' t'+    where s' = simplify s+          t' = simplify t+          simplify = filter (not . (`elem` "0123456789"))++transactionsSimilarTo :: Journal -> [String] -> String -> [(Double,Transaction)]+transactionsSimilarTo j apats s =+    sortBy compareRelevanceAndRecency+               $ filter ((> threshold).fst)+               [(compareDescriptions s $ tdescription t, t) | t <- ts]+    where+      compareRelevanceAndRecency (n1,t1) (n2,t2) = compare (n2,tdate t2) (n1,tdate t1)+      ts = jtxns $ filterJournalTransactionsByAccount apats j+      threshold = 0++runInteraction :: Journal -> InputT IO a -> IO a+runInteraction j m = do+    let cc = completionCache j+    runInputT (setComplete (accountCompletion cc) defaultSettings) m++-- A precomputed list of all accounts previously entered into the journal.+type CompletionCache = [AccountName]++completionCache :: Journal -> CompletionCache+completionCache j = -- Only keep unique account names.+                    Set.toList $ Set.fromList+                        [paccount p | t <- jtxns j, p <- tpostings t]++accountCompletion :: CompletionCache -> CompletionFunc IO+accountCompletion cc = completeWord Nothing+                        "" -- don't break words on whitespace, since account names+                           -- can contain spaces.+                        $ \s -> return $ map simpleCompletion+                                        $ filter (s `isPrefixOf`) cc

@@ -0,0 +1,213 @@+{-# LANGUAGE CPP #-}+{-|++A ledger-compatible @balance@ command.++ledger's balance command is easy to use but not easy to describe+precisely.  In the examples below we'll use sample.journal, which has the+following account tree:++@+ assets+   bank+     checking+     saving+   cash+ expenses+   food+   supplies+ income+   gifts+   salary+ liabilities+   debts+@++The balance command shows accounts with their aggregate balances.+Subaccounts are displayed indented below their parent. Each balance is the+sum of any transactions in that account plus any balances from+subaccounts:++@+ $ hledger -f sample.journal balance+                 $-1  assets+                  $1    bank:saving+                 $-2    cash+                  $2  expenses+                  $1    food+                  $1    supplies+                 $-2  income+                 $-1    gifts+                 $-1    salary+                  $1  liabilities:debts+@++Usually, the non-interesting accounts are elided or omitted. Above,+@checking@ is omitted because it has no subaccounts and a zero balance.+@bank@ is elided because it has only a single displayed subaccount+(@saving@) and it would be showing the same balance as that ($1). Ditto+for @liabilities@. We will return to this in a moment.++The --depth argument can be used to limit the depth of the balance report.+So, to see just the top level accounts:++@+$ hledger -f sample.journal balance --depth 1+                 $-1  assets+                  $2  expenses+                 $-2  income+                  $1  liabilities+@++This time liabilities has no displayed subaccounts (due to --depth) and+is not elided.++With one or more account pattern arguments, the balance command shows+accounts whose name matches one of the patterns, plus their parents+(elided) and subaccounts. So with the pattern o we get:++@+ $ hledger -f sample.journal balance o+                  $1  expenses:food+                 $-2  income+                 $-1    gifts+                 $-1    salary+--------------------+                 $-1+@++The o pattern matched @food@ and @income@, so they are shown. Unmatched+parents of matched accounts are also shown (elided) for context (@expenses@).++Also, the balance report shows the total of all displayed accounts, when+that is non-zero. Here, it is displayed because the accounts shown add up+to $-1.++Here is a more precise definition of \"interesting\" accounts in ledger's+balance report:++- an account which has just one interesting subaccount branch, and which+  is not at the report's maximum depth, is interesting if the balance is+  different from the subaccount's, and otherwise boring.++- any other account is interesting if it has a non-zero balance, or the -E+  flag is used.++-}++module Hledger.Cli.Balance (+  BalanceReport+ ,BalanceReportItem+ ,balance+ ,balanceReport+ ,balanceReportAsText+ -- ,tests_Balance+) where+import Hledger.Data.Utils+import Hledger.Data.Types+import Hledger.Data.Amount+import Hledger.Data.AccountName+import Hledger.Data.Posting+import Hledger.Data.Ledger+import Hledger.Cli.Options+#if __GLASGOW_HASKELL__ <= 610+import Prelude hiding ( putStr )+import System.IO.UTF8+#endif+++-- | A balance report is a chart of accounts with balances, and their grand total.+type BalanceReport = ([BalanceReportItem] -- line items, one per account+                     ,MixedAmount         -- total balance of all accounts+                     )++-- | The data for a single balance report line item, representing one account.+type BalanceReportItem = (AccountName  -- full account name+                         ,AccountName  -- account name elided for display: the leaf name,+                                       -- prefixed by any boring parents immediately above+                         ,Int          -- account depth within this report, excludes boring parents+                         ,MixedAmount) -- account balance, includes subs unless --flat is present++-- | Print a balance report.+balance :: [Opt] -> [String] -> Journal -> IO ()+balance opts args j = do+  t <- getCurrentLocalTime+  putStr $ balanceReportAsText opts $ balanceReport opts (optsToFilterSpec opts args t) j++-- | Render a balance report as plain text suitable for console output.+balanceReportAsText :: [Opt] -> BalanceReport -> String+balanceReportAsText opts (items,total) =+    unlines $+            map (balanceReportItemAsText opts) items+            +++            if NoTotal `elem` opts+             then []+             else ["--------------------"+                  ,padleft 20 $ showMixedAmountWithoutPrice total+                  ]++-- | Render one balance report line item as plain text.+balanceReportItemAsText :: [Opt] -> BalanceReportItem -> String+balanceReportItemAsText opts (a, adisplay, adepth, abal) = concatTopPadded [amt, "  ", name]+    where+      amt = padleft 20 $ showMixedAmountWithoutPrice abal+      name | Flat `elem` opts = accountNameDrop (dropFromOpts opts) a+           | otherwise        = depthspacer ++ adisplay+      depthspacer = replicate (indentperlevel * adepth) ' '+      indentperlevel = 2++-- | Get a balance report with the specified options for this journal.+balanceReport :: [Opt] -> FilterSpec -> Journal -> BalanceReport+balanceReport opts filterspec j = (items, total)+    where+      items = map mkitem interestingaccts+      interestingaccts = filter (isInteresting opts l) acctnames+      acctnames = sort $ tail $ flatten $ treemap aname accttree+      accttree = ledgerAccountTree (fromMaybe 99999 $ depthFromOpts opts) l+      total = sum $ map abalance $ ledgerTopAccounts l+      l = journalToLedger filterspec j+      -- | Get data for one balance report line item.+      mkitem :: AccountName -> BalanceReportItem+      mkitem a = (a, adisplay, indent, abal)+          where+            adisplay | Flat `elem` opts = a+                     | otherwise = accountNameFromComponents $ reverse (map accountLeafName ps) ++ [accountLeafName a]+                where ps = takeWhile boring parents where boring = not . (`elem` interestingparents)+            indent | Flat `elem` opts = 0+                   | otherwise = length interestingparents+            interestingparents = filter (`elem` interestingaccts) parents+            parents = parentAccountNames a+            abal | Flat `elem` opts = exclusiveBalance acct+                 | otherwise = abalance acct+                 where acct = ledgerAccount l a++exclusiveBalance :: Account -> MixedAmount+exclusiveBalance = sumPostings . apostings++-- | Is the named account considered interesting for this ledger's balance report ?+isInteresting :: [Opt] -> Ledger -> AccountName -> Bool+isInteresting opts l a | Flat `elem` opts = isInterestingFlat opts l a+                       | otherwise = isInterestingIndented opts l a++isInterestingFlat :: [Opt] -> Ledger -> AccountName -> Bool+isInterestingFlat opts l a = notempty || emptyflag+    where+      acct = ledgerAccount l a+      notempty = not $ isZeroMixedAmount $ exclusiveBalance acct+      emptyflag = Empty `elem` opts++isInterestingIndented :: [Opt] -> Ledger -> AccountName -> Bool+isInterestingIndented opts l a+    | numinterestingsubs==1 && not atmaxdepth = notlikesub+    | otherwise = notzero || emptyflag+    where+      atmaxdepth = isJust d && Just (accountNameLevel a) == d where d = depthFromOpts opts+      emptyflag = Empty `elem` opts+      acct = ledgerAccount l a+      notzero = not $ isZeroMixedAmount inclbalance where inclbalance = abalance acct+      notlikesub = not $ isZeroMixedAmount exclbalance where exclbalance = sumPostings $ apostings acct+      numinterestingsubs = length $ filter isInterestingTree subtrees+          where+            isInterestingTree = treeany (isInteresting opts l . aname)+            subtrees = map (fromJust . ledgerAccountTreeAt l) $ ledgerSubAccounts l $ ledgerAccount l a+

@@ -0,0 +1,40 @@+{-# LANGUAGE CPP #-}+{-| ++The Commands package defines all the commands offered by the hledger+application, like \"register\" and \"balance\".  This module exports all+the commands; you can also import individual modules if you prefer.++-}++module Hledger.Cli.Commands (+                     module Hledger.Cli.Add,+                     module Hledger.Cli.Balance,+                     module Hledger.Cli.Convert,+                     module Hledger.Cli.Histogram,+                     module Hledger.Cli.Print,+                     module Hledger.Cli.Register,+                     module Hledger.Cli.Stats,+                     tests_Hledger_Commands+              )+where+import Hledger.Cli.Add+import Hledger.Cli.Balance+import Hledger.Cli.Convert+import Hledger.Cli.Histogram+import Hledger.Cli.Print+import Hledger.Cli.Register+import Hledger.Cli.Stats+import Test.HUnit (Test(TestList))+++tests_Hledger_Commands = TestList+    [+--      Hledger.Cli.Add.tests_Add+--     ,Hledger.Cli.Balance.tests_Balance+     Hledger.Cli.Convert.tests_Convert+--     ,Hledger.Cli.Histogram.tests_Histogram+--     ,Hledger.Cli.Print.tests_Print+    ,Hledger.Cli.Register.tests_Register+--     ,Hledger.Cli.Stats.tests_Stats+    ]

@@ -1,201 +0,0 @@-{-# LANGUAGE CPP #-}-{-| --A history-aware add command to help with data entry.---}--module Hledger.Cli.Commands.Add-where-import Hledger.Data-import Hledger.Read.Journal (someamount)-import Hledger.Cli.Options-import Hledger.Cli.Commands.Register (registerReport, registerReportAsText)-#if __GLASGOW_HASKELL__ <= 610-import Prelude hiding (putStr, putStrLn, getLine, appendFile)-import System.IO.UTF8-import System.IO ( stderr, hFlush )-#else-import System.IO ( stderr, hFlush, hPutStrLn, hPutStr )-#endif-import System.IO.Error-import Text.ParserCombinators.Parsec-import Hledger.Cli.Utils (readJournalWithOpts)-import qualified Data.Foldable as Foldable (find)---- | Read transactions from the terminal, prompting for each field,--- and append them to the journal file. If the journal came from stdin, this--- command has no effect.-add :: [Opt] -> [String] -> Journal -> IO ()-add opts args j-    | f == "-" = return ()-    | otherwise = do-  hPutStrLn stderr $-    "Enter one or more transactions, which will be added to your journal file.\n"-    ++"To complete a transaction, enter . as account name. To quit, press control-c."-  today <- getCurrentDay-  getAndAddTransactions j opts args today `catch` (\e -> unless (isEOFError e) $ ioError e)-      where f = filepath j---- | Read a number of transactions from the command line, prompting,--- validating, displaying and appending them to the journal file, until--- end of input (then raise an EOF exception). Any command-line arguments--- are used as the first transaction's description.-getAndAddTransactions :: Journal -> [Opt] -> [String] -> Day -> IO ()-getAndAddTransactions j opts args defaultDate = do-  (t, d) <- getTransaction j opts args defaultDate-  j <- journalAddTransaction j opts t-  getAndAddTransactions j opts args d---- | Read a transaction from the command line, with history-aware prompting.-getTransaction :: Journal -> [Opt] -> [String] -> Day -> IO (Transaction,Day)-getTransaction j opts args defaultDate = do-  today <- getCurrentDay-  datestr <- askFor "date" -            (Just $ showDate defaultDate)-            (Just $ \s -> null s || -             isRight (parse (smartdate >> many spacenonewline >> eof) "" $ lowercase s))-  description <- askFor "description" (Just "") Nothing-  let historymatches = transactionsSimilarTo j args description-      bestmatch | null historymatches = Nothing-                | otherwise = Just $ snd $ head historymatches-      bestmatchpostings = maybe Nothing (Just . tpostings) bestmatch-      date = fixSmartDate today $ fromparse $ (parse smartdate "" . lowercase) datestr-      accept x = x == "." || (not . null) x &&-        if NoNewAccts `elem` opts-            then isJust $ Foldable.find (== x) ant-            else True-        where (ant,_,_,_) = groupPostings $ journalPostings j-      getpostingsandvalidate = do-        ps <- getPostings accept bestmatchpostings []-        let t = nulltransaction{tdate=date-                               ,tstatus=False-                               ,tdescription=description-                               ,tpostings=ps-                               }-            retry msg = do-              hPutStrLn stderr $ "\n" ++ msg ++ "please re-enter."-              getpostingsandvalidate-        either retry (return . flip (,) date) $ balanceTransaction t-  unless (null historymatches) -       (do-         hPutStrLn stderr "Similar transactions found, using the first for defaults:\n"-         hPutStr stderr $ concatMap (\(n,t) -> printf "[%3d%%] %s" (round $ n*100 :: Int) (show t)) $ take 3 historymatches)-  getpostingsandvalidate---- | Read postings from the command line until . is entered, using the--- provided historical postings, if any, to guess defaults.-getPostings :: (AccountName -> Bool) -> Maybe [Posting] -> [Posting] -> IO [Posting]-getPostings accept historicalps enteredps = do-  account <- askFor (printf "account %d" n) defaultaccount (Just accept)-  if account=="."-    then return enteredps-    else do-      amountstr <- askFor (printf "amount  %d" n) defaultamount validateamount-      let amount = fromparse $ parse (someamount <|> return missingamt) "" amountstr-      let p = nullposting{paccount=stripbrackets account,-                          pamount=amount,-                          ptype=postingtype account}-      getPostings accept historicalps $ enteredps ++ [p]-    where-      n = length enteredps + 1-      enteredrealps = filter isReal enteredps-      bestmatch | isNothing historicalps = Nothing-                | n <= length ps = Just $ ps !! (n-1)-                | otherwise = Nothing-                where Just ps = historicalps-      defaultaccount = maybe Nothing (Just . showacctname) bestmatch-      showacctname p = showAccountName Nothing (ptype p) $ paccount p-      defaultamount = maybe balancingamount (Just . show . pamount) bestmatch-          where balancingamount = Just $ show $ negate $ sumMixedAmountsPreservingHighestPrecision $ map pamount enteredrealps-      postingtype ('[':_) = BalancedVirtualPosting-      postingtype ('(':_) = VirtualPosting-      postingtype _ = RegularPosting-      stripbrackets = dropWhile (`elem` "([") . reverse . dropWhile (`elem` "])") . reverse-      validateamount = Just $ \s -> (null s && not (null enteredrealps))-                                   || isRight (parse (someamount>>many spacenonewline>>eof) "" s)---- | Prompt for and read a string value, optionally with a default value--- and a validator. A validator causes the prompt to repeat until the--- input is valid. May also raise an EOF exception if control-d is pressed.-askFor :: String -> Maybe String -> Maybe (String -> Bool) -> IO String-askFor prompt def validator = do-  hPutStr stderr $ prompt ++ maybe "" showdef def ++ ": "-  hFlush stderr-  l <- getLine-  let input = if null l then fromMaybe l def else l-  case validator of-    Just valid -> if valid input-                   then return input-                   else askFor prompt def validator-    Nothing -> return input-    where showdef s = " [" ++ s ++ "]"---- | Append this transaction to the journal's file. Also, to the journal's--- transaction list, but we don't bother updating the other fields - this--- is enough to include new transactions in the history matching.-journalAddTransaction :: Journal -> [Opt] -> Transaction -> IO Journal-journalAddTransaction j@Journal{jtxns=ts} opts t = do-  appendToJournalFile j $ showTransaction t-  when (Debug `elem` opts) $ do-    putStrLn $ printf "\nAdded transaction to %s:" (filepath j)-    putStrLn =<< registerFromString (show t)-  return j{jtxns=ts++[t]}---- | Append data to the journal's file, ensuring proper separation from--- any existing data; or if the file is "-", dump it to stdout.-appendToJournalFile :: Journal -> String -> IO ()-appendToJournalFile Journal{filepath=f, jtext=t} s =-    if f == "-"-    then putStr $ sep ++ s-    else appendFile f $ sep++s-    where -      -- XXX we are looking at the original raw text from when the journal-      -- was first read, but that's good enough for now-      sep | null $ strip t = ""-          | otherwise = replicate (2 - min 2 (length lastnls)) '\n'-          where lastnls = takeWhile (=='\n') $ reverse t---- | Convert a string of journal data into a register report.-registerFromString :: String -> IO String-registerFromString s = do-  now <- getCurrentLocalTime-  l <- readJournalWithOpts [] s-  return $ registerReportAsText opts $ registerReport opts (optsToFilterSpec opts [] now) l-    where opts = [Empty]---- | Return a similarity measure, from 0 to 1, for two strings.--- This is Simon White's letter pairs algorithm from--- http://www.catalysoft.com/articles/StrikeAMatch.html--- with a modification for short strings.-compareStrings :: String -> String -> Double-compareStrings "" "" = 1-compareStrings (_:[]) "" = 0-compareStrings "" (_:[]) = 0-compareStrings (a:[]) (b:[]) = if toUpper a == toUpper b then 1 else 0-compareStrings s1 s2 = 2.0 * fromIntegral i / fromIntegral u-    where-      i = length $ intersect pairs1 pairs2-      u = length pairs1 + length pairs2-      pairs1 = wordLetterPairs $ uppercase s1-      pairs2 = wordLetterPairs $ uppercase s2-wordLetterPairs = concatMap letterPairs . words-letterPairs (a:b:rest) = [a,b] : letterPairs (b:rest)-letterPairs _ = []--compareDescriptions :: [Char] -> [Char] -> Double-compareDescriptions s t = compareStrings s' t'-    where s' = simplify s-          t' = simplify t-          simplify = filter (not . (`elem` "0123456789"))--transactionsSimilarTo :: Journal -> [String] -> String -> [(Double,Transaction)]-transactionsSimilarTo j apats s =-    sortBy compareRelevanceAndRecency-               $ filter ((> threshold).fst)-               [(compareDescriptions s $ tdescription t, t) | t <- ts]-    where-      compareRelevanceAndRecency (n1,t1) (n2,t2) = compare (n2,tdate t2) (n1,tdate t1)-      ts = jtxns $ filterJournalTransactionsByAccount apats j-      threshold = 0-

@@ -1,67 +0,0 @@-{-# LANGUAGE CPP #-}-{-| --The Commands package defines all the commands offered by the hledger-application, like \"register\" and \"balance\".  This module exports all-the commands; you can also import individual modules if you prefer.---}--module Hledger.Cli.Commands.All (-                     module Hledger.Cli.Commands.Add,-                     module Hledger.Cli.Commands.Balance,-                     module Hledger.Cli.Commands.Convert,-                     module Hledger.Cli.Commands.Histogram,-                     module Hledger.Cli.Commands.Print,-                     module Hledger.Cli.Commands.Register,-                     module Hledger.Cli.Commands.Stats,-#ifdef CHART-                     module Hledger.Cli.Commands.Chart,-#endif-#ifdef VTY-                     module Hledger.Cli.Commands.Vty,-#endif-#if defined(WEB)-                     module Hledger.Cli.Commands.Web,-#endif-                     tests_Hledger_Commands-              )-where-import Hledger.Cli.Commands.Add-import Hledger.Cli.Commands.Balance-import Hledger.Cli.Commands.Convert-import Hledger.Cli.Commands.Histogram-import Hledger.Cli.Commands.Print-import Hledger.Cli.Commands.Register-import Hledger.Cli.Commands.Stats-#ifdef CHART-import Hledger.Cli.Commands.Chart-#endif-#ifdef VTY-import Hledger.Cli.Commands.Vty-#endif-#if defined(WEB)-import Hledger.Cli.Commands.Web-#endif-import Test.HUnit (Test(TestList))---tests_Hledger_Commands = TestList-    [---      Hledger.Cli.Commands.Add.tests_Add---     ,Hledger.Cli.Commands.Balance.tests_Balance-     Hledger.Cli.Commands.Convert.tests_Convert---     ,Hledger.Cli.Commands.Histogram.tests_Histogram---     ,Hledger.Cli.Commands.Print.tests_Print-    ,Hledger.Cli.Commands.Register.tests_Register---     ,Hledger.Cli.Commands.Stats.tests_Stats-    ]--- #ifdef CHART---     ,Hledger.Cli.Commands.Chart.tests_Chart--- #endif--- #ifdef VTY---     ,Hledger.Cli.Commands.Vty.tests_Vty--- #endif--- #if defined(WEB)---     ,Hledger.Cli.Commands.Web.tests_Web--- #endif

@@ -1,213 +0,0 @@-{-# LANGUAGE CPP #-}-{-|--A ledger-compatible @balance@ command.--ledger's balance command is easy to use but not easy to describe-precisely.  In the examples below we'll use sample.journal, which has the-following account tree:--@- assets-   bank-     checking-     saving-   cash- expenses-   food-   supplies- income-   gifts-   salary- liabilities-   debts-@--The balance command shows accounts with their aggregate balances.-Subaccounts are displayed indented below their parent. Each balance is the-sum of any transactions in that account plus any balances from-subaccounts:--@- $ hledger -f sample.journal balance-                 $-1  assets-                  $1    bank:saving-                 $-2    cash-                  $2  expenses-                  $1    food-                  $1    supplies-                 $-2  income-                 $-1    gifts-                 $-1    salary-                  $1  liabilities:debts-@--Usually, the non-interesting accounts are elided or omitted. Above,-@checking@ is omitted because it has no subaccounts and a zero balance.-@bank@ is elided because it has only a single displayed subaccount-(@saving@) and it would be showing the same balance as that ($1). Ditto-for @liabilities@. We will return to this in a moment.--The --depth argument can be used to limit the depth of the balance report.-So, to see just the top level accounts:--@-$ hledger -f sample.journal balance --depth 1-                 $-1  assets-                  $2  expenses-                 $-2  income-                  $1  liabilities-@--This time liabilities has no displayed subaccounts (due to --depth) and-is not elided.--With one or more account pattern arguments, the balance command shows-accounts whose name matches one of the patterns, plus their parents-(elided) and subaccounts. So with the pattern o we get:--@- $ hledger -f sample.journal balance o-                  $1  expenses:food-                 $-2  income-                 $-1    gifts-                 $-1    salary----------------------                 $-1-@--The o pattern matched @food@ and @income@, so they are shown. Unmatched-parents of matched accounts are also shown (elided) for context (@expenses@).--Also, the balance report shows the total of all displayed accounts, when-that is non-zero. Here, it is displayed because the accounts shown add up-to $-1.--Here is a more precise definition of \"interesting\" accounts in ledger's-balance report:--- an account which has just one interesting subaccount branch, and which-  is not at the report's maximum depth, is interesting if the balance is-  different from the subaccount's, and otherwise boring.--- any other account is interesting if it has a non-zero balance, or the -E-  flag is used.---}--module Hledger.Cli.Commands.Balance (-  BalanceReport- ,BalanceReportItem- ,balance- ,balanceReport- ,balanceReportAsText- -- ,tests_Balance-) where-import Hledger.Data.Utils-import Hledger.Data.Types-import Hledger.Data.Amount-import Hledger.Data.AccountName-import Hledger.Data.Posting-import Hledger.Data.Ledger-import Hledger.Cli.Options-#if __GLASGOW_HASKELL__ <= 610-import Prelude hiding ( putStr )-import System.IO.UTF8-#endif----- | A balance report is a chart of accounts with balances, and their grand total.-type BalanceReport = ([BalanceReportItem] -- line items, one per account-                     ,MixedAmount         -- total balance of all accounts-                     )---- | The data for a single balance report line item, representing one account.-type BalanceReportItem = (AccountName  -- full account name-                         ,AccountName  -- account name elided for display: the leaf name,-                                       -- prefixed by any boring parents immediately above-                         ,Int          -- account depth within this report, excludes boring parents-                         ,MixedAmount) -- account balance, includes subs unless --flat is present---- | Print a balance report.-balance :: [Opt] -> [String] -> Journal -> IO ()-balance opts args j = do-  t <- getCurrentLocalTime-  putStr $ balanceReportAsText opts $ balanceReport opts (optsToFilterSpec opts args t) j---- | Render a balance report as plain text suitable for console output.-balanceReportAsText :: [Opt] -> BalanceReport -> String-balanceReportAsText opts (items,total) =-    unlines $-            map (balanceReportItemAsText opts) items-            ++-            if NoTotal `elem` opts-             then []-             else ["--------------------"-                  ,padleft 20 $ showMixedAmountWithoutPrice total-                  ]---- | Render one balance report line item as plain text.-balanceReportItemAsText :: [Opt] -> BalanceReportItem -> String-balanceReportItemAsText opts (a, adisplay, adepth, abal) = concatTopPadded [amt, "  ", name]-    where-      amt = padleft 20 $ showMixedAmountWithoutPrice abal-      name | Flat `elem` opts = accountNameDrop (dropFromOpts opts) a-           | otherwise        = depthspacer ++ adisplay-      depthspacer = replicate (indentperlevel * adepth) ' '-      indentperlevel = 2---- | Get a balance report with the specified options for this journal.-balanceReport :: [Opt] -> FilterSpec -> Journal -> BalanceReport-balanceReport opts filterspec j = (items, total)-    where-      items = map mkitem interestingaccts-      interestingaccts = filter (isInteresting opts l) acctnames-      acctnames = sort $ tail $ flatten $ treemap aname accttree-      accttree = ledgerAccountTree (fromMaybe 99999 $ depthFromOpts opts) l-      total = sum $ map abalance $ ledgerTopAccounts l-      l = journalToLedger filterspec j-      -- | Get data for one balance report line item.-      mkitem :: AccountName -> BalanceReportItem-      mkitem a = (a, adisplay, indent, abal)-          where-            adisplay | Flat `elem` opts = a-                     | otherwise = accountNameFromComponents $ reverse (map accountLeafName ps) ++ [accountLeafName a]-                where ps = takeWhile boring parents where boring = not . (`elem` interestingparents)-            indent | Flat `elem` opts = 0-                   | otherwise = length interestingparents-            interestingparents = filter (`elem` interestingaccts) parents-            parents = parentAccountNames a-            abal | Flat `elem` opts = exclusiveBalance acct-                 | otherwise = abalance acct-                 where acct = ledgerAccount l a--exclusiveBalance :: Account -> MixedAmount-exclusiveBalance = sumPostings . apostings---- | Is the named account considered interesting for this ledger's balance report ?-isInteresting :: [Opt] -> Ledger -> AccountName -> Bool-isInteresting opts l a | Flat `elem` opts = isInterestingFlat opts l a-                       | otherwise = isInterestingIndented opts l a--isInterestingFlat :: [Opt] -> Ledger -> AccountName -> Bool-isInterestingFlat opts l a = notempty || emptyflag-    where-      acct = ledgerAccount l a-      notempty = not $ isZeroMixedAmount $ exclusiveBalance acct-      emptyflag = Empty `elem` opts--isInterestingIndented :: [Opt] -> Ledger -> AccountName -> Bool-isInterestingIndented opts l a-    | numinterestingsubs==1 && not atmaxdepth = notlikesub-    | otherwise = notzero || emptyflag-    where-      atmaxdepth = isJust d && Just (accountNameLevel a) == d where d = depthFromOpts opts-      emptyflag = Empty `elem` opts-      acct = ledgerAccount l a-      notzero = not $ isZeroMixedAmount inclbalance where inclbalance = abalance acct-      notlikesub = not $ isZeroMixedAmount exclbalance where exclbalance = sumPostings $ apostings acct-      numinterestingsubs = length $ filter isInterestingTree subtrees-          where-            isInterestingTree = treeany (isInteresting opts l . aname)-            subtrees = map (fromJust . ledgerAccountTreeAt l) $ ledgerSubAccounts l $ ledgerAccount l a-

@@ -1,108 +0,0 @@-{-|--Generate balances pie chart---}--module Hledger.Cli.Commands.Chart-where-import Hledger.Data.Utils-import Hledger.Data.Types-import Hledger.Data.Amount-import Hledger.Data.Ledger-import Hledger.Data.Commodity-import Hledger.Cli.Options--import Control.Monad (liftM3)-import Graphics.Rendering.Chart-import Data.Colour-import Data.Colour.Names-import Data.Colour.RGBSpace-import Data.Colour.RGBSpace.HSL (hsl)-import Data.Colour.SRGB.Linear (rgb)-import Data.List-import Safe (readDef)---- | Generate an image with the pie chart and write it to a file-chart :: [Opt] -> [String] -> Journal -> IO ()-chart opts args j = do-  t <- getCurrentLocalTime-  let chart = genPie opts (optsToFilterSpec opts args t) j-  renderableToPNGFile (toRenderable chart) w h filename-    where-      filename = getOption opts ChartOutput chartoutput-      (w,h) = parseSize $ getOption opts ChartSize chartsize---- | Extract string option value from a list of options or use the default-getOption :: [Opt] -> (String->Opt) -> String -> String-getOption opts opt def = -    case reverse $ optValuesForConstructor opt opts of-        [] -> def-        x:_ -> x---- | Parse image size from a command-line option-parseSize :: String -> (Int,Int)-parseSize str = (read w, read h)-    where-    x = fromMaybe (error' "Size should be in WIDTHxHEIGHT format") $ findIndex (=='x') str-    (w,_:h) = splitAt x str---- | Generate pie chart-genPie :: [Opt] -> FilterSpec -> Journal -> PieLayout-genPie opts filterspec j = defaultPieLayout { pie_background_ = solidFillStyle $ opaque $ white-                                            , pie_plot_ = pie_chart }-    where-      pie_chart = defaultPieChart { pie_data_ = map (uncurry accountPieItem) chartitems'-                                  , pie_start_angle_ = (-90)-                                  , pie_colors_ = mkColours hue-                                  , pie_label_style_ = defaultFontStyle{font_size_=12}-                                  }-      chartitems' = debug "chart" $ top num samesignitems-      (samesignitems, sign) = sameSignNonZero rawitems-      rawitems = debug "raw" $ flatten $ balances $-                 ledgerAccountTree (fromMaybe 99999 $ depthFromOpts opts) $ journalToLedger filterspec j-      top n t = topn ++ [other]-          where-            (topn,rest) = splitAt n $ reverse $ sortBy (comparing snd) t-            other = ("other", sum $ map snd rest)-      num = readDef (fromIntegral chartitems) (getOption opts ChartItems (show chartitems))-      hue = if sign > 0 then red else green where (red, green) = (0, 110)-      debug s = if Debug `elem` opts then ltrace s else id---- | Select the nonzero items with same sign as the first, and make--- them positive. Also return a 1 or -1 corresponding to the original sign.-sameSignNonZero :: [(AccountName, Double)] -> ([(AccountName, Double)], Int)-sameSignNonZero is | null nzs = ([], 1)-                   | otherwise = (map pos $ filter (test.snd) nzs, sign)-                   where-                     nzs = filter ((/=0).snd) is-                     pos (a,b) = (a, abs b)-                     sign = if snd (head nzs) >= 0 then 1 else (-1)-                     test = if sign > 0 then (>0) else (<0)---- | Convert all quantities of MixedAccount to a single commodity-amountValue :: MixedAmount -> Double-amountValue = quantity . convertMixedAmountTo unknown---- | Generate a tree of account names together with their balances.---   The balance of account is decremented by the balance of its subaccounts---   which are drawn on the chart.-balances :: Tree Account -> Tree (AccountName, Double)-balances (Node rootAcc subAccs) = Node newroot newsubs-    where-      newroot = (aname rootAcc,-                 amountValue $-                 abalance rootAcc - (sum . map (abalance . root)) subAccs)-      newsubs = map balances subAccs---- | Build a single pie chart item-accountPieItem :: AccountName -> Double -> PieItem-accountPieItem accname balance = PieItem accname offset balance where offset = 0---- | Generate an infinite color list suitable for charts.-mkColours :: Double -> [AlphaColour Double]-mkColours hue = cycle $ [opaque $ rgbToColour $ hsl h s l | (h,s,l) <- liftM3 (,,)-                         [hue] [0.7] [0.1,0.2..0.7] ]--rgbToColour :: (Fractional a) => RGB a -> Colour a-rgbToColour (RGB r g b) = rgb r g b

@@ -1,387 +0,0 @@-{-|-Convert account data in CSV format (eg downloaded from a bank) to journal-format, and print it on stdout. See the manual for more details.--}--module Hledger.Cli.Commands.Convert where-import Hledger.Cli.Options (Opt(Debug))-import Hledger.Cli.Version (versionstr)-import Hledger.Data.Types (Journal,AccountName,Transaction(..),Posting(..),PostingType(..))-import Hledger.Data.Utils (strip, spacenonewline, restofline, parseWithCtx, assertParse, assertParseEqual, error')-import Hledger.Read.Common (emptyCtx)-import Hledger.Read.Journal (someamount,ledgeraccountname)-import Hledger.Data.Amount (nullmixedamt)-import Safe (atDef, maximumDef)-import System.IO (stderr)-import Text.CSV (parseCSVFromFile, printCSV)-import Text.Printf (hPrintf)-import Text.RegexPR (matchRegexPR, gsubRegexPR)-import Data.Maybe-import Hledger.Data.Dates (firstJust, showDate, parsedate)-import System.Locale (defaultTimeLocale)-import Data.Time.Format (parseTime)-import Control.Monad (when, guard, liftM)-import Safe (readDef, readMay)-import System.Directory (doesFileExist)-import System.Exit (exitFailure)-import System.FilePath (takeBaseName, replaceExtension)-import Text.ParserCombinators.Parsec-import Test.HUnit---{- |-A set of data definitions and account-matching patterns sufficient to-convert a particular CSV data file into meaningful journal transactions. See above.--}-data CsvRules = CsvRules {-      dateField :: Maybe FieldPosition,-      statusField :: Maybe FieldPosition,-      codeField :: Maybe FieldPosition,-      descriptionField :: Maybe FieldPosition,-      amountField :: Maybe FieldPosition,-      currencyField :: Maybe FieldPosition,-      baseCurrency :: Maybe String,-      baseAccount :: AccountName,-      accountRules :: [AccountRule]-} deriving (Show, Eq)--nullrules = CsvRules {-      dateField=Nothing,-      statusField=Nothing,-      codeField=Nothing,-      descriptionField=Nothing,-      amountField=Nothing,-      currencyField=Nothing,-      baseCurrency=Nothing,-      baseAccount="unknown",-      accountRules=[]-}--type FieldPosition = Int--type AccountRule = (-   [(String, Maybe String)] -- list of regex match patterns with optional replacements-  ,AccountName              -- account name to use for a transaction matching this rule-  )--type CsvRecord = [String]----- | Read the CSV file named as an argument and print equivalent journal transactions,--- using/creating a .rules file.-convert :: [Opt] -> [String] -> Journal -> IO ()-convert opts args _ = do-  when (null args) $ error' "please specify a csv data file."-  let csvfile = head args-  csvparse <- parseCSVFromFile csvfile-  let records = case csvparse of-                  Left e -> error' $ show e-                  Right rs -> reverse $ filter (/= [""]) rs-  let debug = Debug `elem` opts-      rulesfile = rulesFileFor csvfile-  exists <- doesFileExist rulesfile-  if (not exists) then do-                  hPrintf stderr "creating conversion rules file %s, edit this file for better results\n" rulesfile-                  writeFile rulesfile initialRulesFileContent-   else-      hPrintf stderr "using conversion rules file %s\n" rulesfile-  rules <- liftM (either (error'.show) id) $ parseCsvRulesFile rulesfile-  when debug $ hPrintf stderr "rules: %s\n" (show rules)-  let requiredfields = max 2 (maxFieldIndex rules + 1)-      badrecords = take 1 $ filter ((< requiredfields).length) records-  if null badrecords-   then mapM_ (printTxn debug rules) records-   else do-     hPrintf stderr (unlines [-                      "Warning, at least one CSV record does not contain a field referenced by the"-                     ,"conversion rules file, or has less than two fields. Are you converting a"-                     ,"valid CSV file ? First bad record:\n%s"-                     ]) (show $ head badrecords)-     exitFailure---- | The highest (0-based) field index referenced in the field--- definitions, or -1 if no fields are defined.-maxFieldIndex :: CsvRules -> Int-maxFieldIndex r = maximumDef (-1) $ catMaybes [-                   dateField r-                  ,statusField r-                  ,codeField r-                  ,descriptionField r-                  ,amountField r-                  ,currencyField r-                  ]--rulesFileFor :: FilePath -> FilePath-rulesFileFor csvfile = replaceExtension csvfile ".rules"--initialRulesFileContent :: String-initialRulesFileContent =-    "# csv conversion rules file generated by hledger "++versionstr++"\n" ++-    "# Add rules to this file for more accurate conversion, see\n"++-    "# http://hledger.org/MANUAL.html#convert\n" ++-    "\n" ++-    "base-account assets:bank:checking\n" ++-    "date-field 0\n" ++-    "description-field 4\n" ++-    "amount-field 1\n" ++-    "currency $\n" ++-    "\n" ++-    "# account-assigning rules\n" ++-    "\n" ++-    "SPECTRUM\n" ++-    "expenses:health:gym\n" ++-    "\n" ++-    "ITUNES\n" ++-    "BLKBSTR=BLOCKBUSTER\n" ++-    "expenses:entertainment\n" ++-    "\n" ++-    "(TO|FROM) SAVINGS\n" ++-    "assets:bank:savings\n"---- rules file parser--parseCsvRulesFile :: FilePath -> IO (Either ParseError CsvRules)-parseCsvRulesFile f = do-  s <- readFile f-  return $ parseCsvRules f s--parseCsvRules :: FilePath -> String -> Either ParseError CsvRules-parseCsvRules rulesfile s = runParser csvrulesfile nullrules{baseAccount=takeBaseName rulesfile} rulesfile s--csvrulesfile :: GenParser Char CsvRules CsvRules-csvrulesfile = do-  many blankorcommentline-  many definitions-  r <- getState-  ars <- many accountrule-  many blankorcommentline-  eof-  return r{accountRules=ars}---- | Real independent parser choice, even when alternative matches share a prefix.-choice' parsers = choice $ map try (init parsers) ++ [last parsers]--definitions :: GenParser Char CsvRules ()-definitions = do-  choice' [-    datefield-   ,statusfield-   ,codefield-   ,descriptionfield-   ,amountfield-   ,currencyfield-   ,basecurrency-   ,baseaccount-   ,commentline-   ] <?> "definition"-  return ()--datefield = do-  string "date-field"-  many1 spacenonewline-  v <- restofline-  r <- getState-  setState r{dateField=readMay v}--codefield = do-  string "code-field"-  many1 spacenonewline-  v <- restofline-  r <- getState-  setState r{codeField=readMay v}--statusfield = do-  string "status-field"-  many1 spacenonewline-  v <- restofline-  r <- getState-  setState r{statusField=readMay v}--descriptionfield = do-  string "description-field"-  many1 spacenonewline-  v <- restofline-  r <- getState-  setState r{descriptionField=readMay v}--amountfield = do-  string "amount-field"-  many1 spacenonewline-  v <- restofline-  r <- getState-  setState r{amountField=readMay v}--currencyfield = do-  string "currency-field"-  many1 spacenonewline-  v <- restofline-  r <- getState-  setState r{currencyField=readMay v}--basecurrency = do-  string "currency"-  many1 spacenonewline-  v <- restofline-  r <- getState-  setState r{baseCurrency=Just v}--baseaccount = do-  string "base-account"-  many1 spacenonewline-  v <- ledgeraccountname-  optional newline-  r <- getState-  setState r{baseAccount=v}--accountrule :: GenParser Char CsvRules AccountRule-accountrule = do-  many blankorcommentline-  pats <- many1 matchreplacepattern-  guard $ length pats >= 2-  let pats' = init pats-      acct = either (fail.show) id $ runParser ledgeraccountname () "" $ fst $ last pats-  many blankorcommentline-  return (pats',acct)- <?> "account rule"--blanklines = many1 blankline >> return ()--blankline = many spacenonewline >> newline >> return () <?> "blank line"--commentchar = oneOf ";#"--commentline = many spacenonewline >> commentchar >> restofline >> return () <?> "comment line"--blankorcommentline = choice' [blankline, commentline]--matchreplacepattern = do-  notFollowedBy commentchar-  matchpat <- many1 (noneOf "=\n")-  replpat <- optionMaybe $ do {char '='; many $ noneOf "\n"}-  newline-  return (matchpat,replpat)--printTxn :: Bool -> CsvRules -> CsvRecord -> IO ()-printTxn debug rules rec = do-  when debug $ hPrintf stderr "record: %s" (printCSV [rec])-  putStr $ show $ transactionFromCsvRecord rules rec---- csv record conversion--transactionFromCsvRecord :: CsvRules -> CsvRecord -> Transaction-transactionFromCsvRecord rules fields =-  let -      date = parsedate $ normaliseDate $ maybe "1900/1/1" (atDef "" fields) (dateField rules)-      status = maybe False (null . strip . (atDef "" fields)) (statusField rules)-      code = maybe "" (atDef "" fields) (codeField rules)-      desc = maybe "" (atDef "" fields) (descriptionField rules)-      comment = ""-      precomment = ""-      amountstr = maybe "" (atDef "" fields) (amountField rules)-      amountstr' = strnegate amountstr where strnegate ('-':s) = s-                                             strnegate s = '-':s-      currency = maybe (fromMaybe "" $ baseCurrency rules) (atDef "" fields) (currencyField rules)-      amountstr'' = currency ++ amountstr'-      amountparse = runParser someamount emptyCtx "" amountstr''-      amount = either (const nullmixedamt) id amountparse-      unknownacct | (readDef 0 amountstr' :: Double) < 0 = "income:unknown"-                  | otherwise = "expenses:unknown"-      (acct,newdesc) = identify (accountRules rules) unknownacct desc-      t = Transaction {-              tdate=date,-              teffectivedate=Nothing,-              tstatus=status,-              tcode=code,-              tdescription=newdesc,-              tcomment=comment,-              tpreceding_comment_lines=precomment,-              tpostings=[-                   Posting {-                     pstatus=False,-                     paccount=acct,-                     pamount=amount,-                     pcomment="",-                     ptype=RegularPosting,-                     ptransaction=Just t-                   },-                   Posting {-                     pstatus=False,-                     paccount=baseAccount rules,-                     pamount=(-amount),-                     pcomment="",-                     ptype=RegularPosting,-                     ptransaction=Just t-                   }-                  ]-            }-  in t---- | Convert some date string with unknown format to YYYY/MM/DD.-normaliseDate :: String -> String-normaliseDate s = maybe "0000/00/00" showDate $-              firstJust-              [parseTime defaultTimeLocale "%Y/%m/%e" s-               -- can't parse a month without leading 0, try adding one-              ,parseTime defaultTimeLocale "%Y/%m/%e" (take 5 s ++ "0" ++ drop 5 s)-              ,parseTime defaultTimeLocale "%Y-%m-%e" s-              ,parseTime defaultTimeLocale "%Y-%m-%e" (take 5 s ++ "0" ++ drop 5 s)-              ,parseTime defaultTimeLocale "%m/%e/%Y" s-              ,parseTime defaultTimeLocale "%m/%e/%Y" ('0':s)-              ,parseTime defaultTimeLocale "%m-%e-%Y" s-              ,parseTime defaultTimeLocale "%m-%e-%Y" ('0':s)-              ]---- | Apply account matching rules to a transaction description to obtain--- the most appropriate account and a new description.-identify :: [AccountRule] -> String -> String -> (String,String)-identify rules defacct desc | null matchingrules = (defacct,desc)-                            | otherwise = (acct,newdesc)-    where-      matchingrules = filter ismatch rules :: [AccountRule]-          where ismatch = any (isJust . flip matchRegexPR (caseinsensitive desc) . fst) . fst-      (prs,acct) = head matchingrules-      p_ms_r = filter (\(_,m,_) -> isJust m) $ map (\(p,r) -> (p, matchRegexPR (caseinsensitive p) desc, r)) prs-      (p,_,r) = head p_ms_r-      newdesc = case r of Just rpat -> gsubRegexPR (caseinsensitive p) rpat desc-                          Nothing   -> desc--caseinsensitive = ("(?i)"++)--tests_Convert = TestList [--   "convert rules parsing: empty file" ~: do-     -- let assertMixedAmountParse parseresult mixedamount =-     --         (either (const "parse error") showMixedAmountDebug parseresult) ~?= (showMixedAmountDebug mixedamount)-    assertParseEqual (parseCsvRules "unknown" "") nullrules--  ,"convert rules parsing: accountrule" ~: do-     assertParseEqual (parseWithCtx nullrules accountrule "A\na\n") -- leading blank line required-                 ([("A",Nothing)], "a")--  ,"convert rules parsing: trailing comments" ~: do-     assertParse (parseWithCtx nullrules csvrulesfile "A\na\n# \n#\n")--  ,"convert rules parsing: trailing blank lines" ~: do-     assertParse (parseWithCtx nullrules csvrulesfile "A\na\n\n  \n")--  -- not supported-  -- ,"convert rules parsing: no final newline" ~: do-  --    assertParse (parseWithCtx nullrules csvrulesfile "A\na")-  --    assertParse (parseWithCtx nullrules csvrulesfile "A\na\n# \n#")-  --    assertParse (parseWithCtx nullrules csvrulesfile "A\na\n\n  ")--                 -- (nullrules{-                 --   -- dateField=Maybe FieldPosition,-                 --   -- statusField=Maybe FieldPosition,-                 --   -- codeField=Maybe FieldPosition,-                 --   -- descriptionField=Maybe FieldPosition,-                 --   -- amountField=Maybe FieldPosition,-                 --   -- currencyField=Maybe FieldPosition,-                 --   -- baseCurrency=Maybe String,-                 --   -- baseAccount=AccountName,-                 --   accountRules=[-                 --        ([("A",Nothing)], "a")-                 --       ]-                 --  })--  ]

@@ -1,50 +0,0 @@-{-# LANGUAGE CPP #-}-{-| --Print a histogram report.---}--module Hledger.Cli.Commands.Histogram-where-import Hledger.Data-import Hledger.Cli.Options-#if __GLASGOW_HASKELL__ <= 610-import Prelude hiding ( putStr )-import System.IO.UTF8-#endif---barchar = '*'---- | Print a histogram of some statistic per reporting interval, such as--- number of postings per day.-histogram :: [Opt] -> [String] -> Journal -> IO ()-histogram opts args j = do-  t <- getCurrentLocalTime-  putStr $ showHistogram opts (optsToFilterSpec opts args t) j--showHistogram :: [Opt] -> FilterSpec -> Journal -> String-showHistogram opts filterspec j = concatMap (printDayWith countBar) dayps-    where-      i = intervalFromOpts opts-      interval | i == NoInterval = Daily-               | otherwise = i-      fullspan = journalDateSpan j-      days = filter (DateSpan Nothing Nothing /=) $ splitSpan interval fullspan-      dayps = [(s, filter (isPostingInDateSpan s) ps) | s <- days]-      -- same as Register-      -- should count transactions, not postings ?-      ps = sortBy (comparing postingDate) $ filterempties $ filter matchapats $ filterdepth $ journalPostings j-      filterempties-          | Empty `elem` opts = id-          | otherwise = filter (not . isZeroMixedAmount . pamount)-      matchapats = matchpats apats . paccount-      apats = acctpats filterspec-      filterdepth | interval == NoInterval = filter (\p -> accountNameLevel (paccount p) <= depth)-                  | otherwise = id-      depth = fromMaybe 99999 $ depthFromOpts opts--printDayWith f (DateSpan b _, ts) = printf "%s %s\n" (show $ fromJust b) (f ts)--countBar ps = replicate (length ps) barchar

@@ -1,43 +0,0 @@-{-# LANGUAGE CPP #-}-{-| --A ledger-compatible @print@ command.---}--module Hledger.Cli.Commands.Print (-  JournalReport- ,JournalReportItem- ,print'- ,journalReport- ,showTransactions-) where-import Hledger.Data-import Hledger.Cli.Options-#if __GLASGOW_HASKELL__ <= 610-import Prelude hiding ( putStr )-import System.IO.UTF8-#endif----- | A "journal report" is just a list of transactions.-type JournalReport = [JournalReportItem]---- | The data for a single journal report item, representing one transaction.-type JournalReportItem = Transaction---- | Print journal transactions in standard format.-print' :: [Opt] -> [String] -> Journal -> IO ()-print' opts args j = do-  t <- getCurrentLocalTime-  putStr $ showTransactions (optsToFilterSpec opts args t) j--showTransactions :: FilterSpec -> Journal -> String-showTransactions fspec j = journalReportAsText [] fspec $ journalReport [] fspec j--journalReportAsText :: [Opt] -> FilterSpec -> JournalReport -> String -- XXX unlike the others, this one needs fspec not opts-journalReportAsText _ fspec items = concatMap (showTransactionForPrint effective) items-    where effective = EffectiveDate == whichdate fspec--journalReport :: [Opt] -> FilterSpec -> Journal -> JournalReport-journalReport _ fspec j = sortBy (comparing tdate) $ jtxns $ filterJournalTransactions fspec j

@@ -1,207 +0,0 @@-{-# LANGUAGE CPP #-}-{-| --A ledger-compatible @register@ command.---}--module Hledger.Cli.Commands.Register (-  RegisterReport- ,RegisterReportItem- ,register- ,registerReport- ,registerReportAsText- ,showPostingWithBalanceForVty- ,tests_Register-) where--import Safe (headMay, lastMay)-import Hledger.Data-import Hledger.Cli.Options-#if __GLASGOW_HASKELL__ <= 610-import Prelude hiding ( putStr )-import System.IO.UTF8-#endif-import Text.ParserCombinators.Parsec----- | A register report is a list of postings to an account or set of--- accounts, with a running total. Postings may be actual postings, or--- virtual postings aggregated over a reporting interval.-type RegisterReport = [RegisterReportItem] -- line items, one per posting---- | The data for a single register report line item, representing one posting.-type RegisterReportItem = (Maybe (Day, String) -- transaction date and description if this is the first posting-                          ,Posting             -- the posting-                          ,MixedAmount         -- balance so far-                          )---- | Print a register report.-register :: [Opt] -> [String] -> Journal -> IO ()-register opts args j = do-  t <- getCurrentLocalTime-  putStr $ registerReportAsText opts $ registerReport opts (optsToFilterSpec opts args t) j---- | Render a register report as plain text suitable for console output.-registerReportAsText :: [Opt] -> RegisterReport -> String-registerReportAsText opts = unlines . map (registerReportItemAsText opts)---- | Render one register report line item as plain text. Eg:--- @--- date (10)  description (20)     account (22)            amount (11)  balance (12)--- DDDDDDDDDD dddddddddddddddddddd aaaaaaaaaaaaaaaaaaaaaa  AAAAAAAAAAA AAAAAAAAAAAA--- ^ displayed for first postings^---   only, otherwise blank--- @-registerReportItemAsText :: [Opt] -> RegisterReportItem -> String-registerReportItemAsText _ (dd, p, b) = concatTopPadded [datedesc, pstr, " ", bal]-    where-      datedesc = case dd of Nothing -> replicate datedescwidth ' '-                            Just (da, de) -> printf "%s %s " date desc-                                where-                                  date = showDate da-                                  desc = printf ("%-"++(show descwidth)++"s") $ elideRight descwidth de :: String-          where-            descwidth = datedescwidth - datewidth - 2-            datedescwidth = 32-            datewidth = 10-      pstr = showPostingForRegister p-      bal = padleft 12 (showMixedAmountOrZeroWithoutPrice b)--showPostingWithBalanceForVty showtxninfo p b = registerReportItemAsText [] $ mkitem showtxninfo p b---- | Get a register report with the specified options for this journal.-registerReport :: [Opt] -> FilterSpec -> Journal -> RegisterReport-registerReport opts fspec j = getitems ps nullposting startbal-    where-      ps | interval == NoInterval = displayableps-         | otherwise              = summarisePostingsByInterval interval depth empty filterspan displayableps-      (precedingps, displayableps, _) = postingsMatchingDisplayExpr (displayExprFromOpts opts)-                                        $ depthClipPostings depth-                                        $ journalPostings-                                        $ filterJournalPostings fspec{depth=Nothing} j-      startbal = sumPostings precedingps-      filterspan = datespan fspec-      (interval, depth, empty) = (intervalFromOpts opts, depthFromOpts opts, Empty `elem` opts)---- | Generate register report line items.-getitems :: [Posting] -> Posting -> MixedAmount -> [RegisterReportItem]-getitems [] _ _ = []-getitems (p:ps) pprev b = i:(getitems ps p b')-    where-      i = mkitem isfirst p b'-      isfirst = ptransaction p /= ptransaction pprev-      b' = b + pamount p---- | Generate one register report line item, from a flag indicating--- whether to include transaction info, a posting, and the current running--- balance.-mkitem :: Bool -> Posting -> MixedAmount -> RegisterReportItem-mkitem False p b = (Nothing, p, b)-mkitem True p b = (ds, p, b)-    where ds = case ptransaction p of Just (Transaction{tdate=da,tdescription=de}) -> Just (da,de)-                                      Nothing -> Just (nulldate,"")---- | Date-sort and split a list of postings into three spans - postings matched--- by the given display expression, and the preceding and following postings.-postingsMatchingDisplayExpr :: Maybe String -> [Posting] -> ([Posting],[Posting],[Posting])-postingsMatchingDisplayExpr d ps = (before, matched, after)-    where -      sorted = sortBy (comparing postingDate) ps-      (before, rest) = break (displayExprMatches d) sorted-      (matched, after) = span (displayExprMatches d) rest---- | Does this display expression allow this posting to be displayed ?--- Raises an error if the display expression can't be parsed.-displayExprMatches :: Maybe String -> Posting -> Bool-displayExprMatches Nothing  _ = True-displayExprMatches (Just d) p = (fromparse $ parsewith datedisplayexpr d) p-                        --- | Parse a hledger display expression, which is a simple date test like--- "d>[DATE]" or "d<=[DATE]", and return a "Posting"-matching predicate.-datedisplayexpr :: GenParser Char st (Posting -> Bool)-datedisplayexpr = do-  char 'd'-  op <- compareop-  char '['-  (y,m,d) <- smartdate-  char ']'-  let date    = parsedate $ printf "%04s/%02s/%02s" y m d-      test op = return $ (`op` date) . postingDate-  case op of-    "<"  -> test (<)-    "<=" -> test (<=)-    "="  -> test (==)-    "==" -> test (==)-    ">=" -> test (>=)-    ">"  -> test (>)-    _    -> mzero- where-  compareop = choice $ map (try . string) ["<=",">=","==","<","=",">"]---- XXX confusing, refactor---- | Convert a list of postings into summary postings. Summary postings--- are one per account per interval and aggregated to the specified depth--- if any.-summarisePostingsByInterval :: Interval -> Maybe Int -> Bool -> DateSpan -> [Posting] -> [Posting]-summarisePostingsByInterval interval depth empty filterspan ps = concatMap summarisespan $ splitSpan interval reportspan-    where-      summarisespan s = summarisePostingsInDateSpan s depth empty (postingsinspan s)-      postingsinspan s = filter (isPostingInDateSpan s) ps-      dataspan = postingsDateSpan ps-      reportspan | empty = filterspan `orDatesFrom` dataspan-                 | otherwise = dataspan---- | Given a date span (representing a reporting interval) and a list of--- postings within it: aggregate the postings so there is only one per--- account, and adjust their date/description so that they will render--- as a summary for this interval.--- --- As usual with date spans the end date is exclusive, but for display--- purposes we show the previous day as end date, like ledger.--- --- When a depth argument is present, postings to accounts of greater--- depth are aggregated where possible.--- --- The showempty flag includes spans with no postings and also postings--- with 0 amount.-summarisePostingsInDateSpan :: DateSpan -> Maybe Int -> Bool -> [Posting] -> [Posting]-summarisePostingsInDateSpan (DateSpan b e) depth showempty ps-    | null ps && (isNothing b || isNothing e) = []-    | null ps && showempty = [summaryp]-    | otherwise = summaryps'-    where-      summaryp = summaryPosting b' ("- "++ showDate (addDays (-1) e'))-      b' = fromMaybe (maybe nulldate postingDate $ headMay ps) b-      e' = fromMaybe (maybe (addDays 1 nulldate) postingDate $ lastMay ps) e-      summaryPosting date desc = nullposting{ptransaction=Just nulltransaction{tdate=date,tdescription=desc}}--      summaryps' = (if showempty then id else filter (not . isZeroMixedAmount . pamount)) summaryps-      summaryps = [summaryp{paccount=a,pamount=balancetoshowfor a} | a <- clippedanames]-      anames = sort $ nub $ map paccount ps-      -- aggregate balances by account, like journalToLedger, then do depth-clipping-      (_,_,exclbalof,inclbalof) = groupPostings ps-      clippedanames = nub $ map (clipAccountName d) anames-      isclipped a = accountNameLevel a >= d-      d = fromMaybe 99999 $ depth-      balancetoshowfor a =-          (if isclipped a then inclbalof else exclbalof) (if null a then "top" else a)---- | Clip the account names to the specified depth in a list of postings.-depthClipPostings :: Maybe Int -> [Posting] -> [Posting]-depthClipPostings depth = map (depthClipPosting depth)---- | Clip a posting's account name to the specified depth.-depthClipPosting :: Maybe Int -> Posting -> Posting-depthClipPosting Nothing p = p-depthClipPosting (Just d) p@Posting{paccount=a} = p{paccount=clipAccountName d a}---tests_Register :: Test-tests_Register = TestList [--         "summarisePostingsByInterval" ~: do-           summarisePostingsByInterval Quarterly Nothing False (DateSpan Nothing Nothing) [] ~?= []--        ]

@@ -1,84 +0,0 @@-{-# LANGUAGE CPP #-}-{-|--Print some statistics for the journal.---}--module Hledger.Cli.Commands.Stats-where-import Hledger.Data-import Hledger.Cli.Options-import qualified Data.Map as Map-#if __GLASGOW_HASKELL__ <= 610-import Prelude hiding ( putStr )-import System.IO.UTF8-#endif----- like Register.summarisePostings--- | Print various statistics for the journal.-stats :: [Opt] -> [String] -> Journal -> IO ()-stats opts args j = do-  today <- getCurrentDay-  t <- getCurrentLocalTime-  let filterspec = optsToFilterSpec opts args t-      l = journalToLedger filterspec j-      reportspan = (ledgerDateSpan l) `orDatesFrom` (datespan filterspec)-      intervalspans = splitSpan (intervalFromOpts opts) reportspan-      showstats = showLedgerStats opts args l today-      s = intercalate "\n" $ map showstats intervalspans-  putStr s--showLedgerStats :: [Opt] -> [String] -> Ledger -> Day -> DateSpan -> String-showLedgerStats _ _ l today span =-    unlines (map (uncurry (printf fmt)) stats)-    where-      fmt = "%-" ++ show w1 ++ "s: %-" ++ show w2 ++ "s"-      w1 = maximum $ map (length . fst) stats-      w2 = maximum $ map (length . show . snd) stats-      stats = [-         ("Journal file", filepath $ journal l)-        ,("Transactions span", printf "%s to %s (%d days)" (start span) (end span) days)-        ,("Last transaction", maybe "none" show lastdate ++ showelapsed lastelapsed)-        ,("Transactions", printf "%d (%0.1f per day)" tnum txnrate)-        ,("Transactions last 30 days", printf "%d (%0.1f per day)" tnum30 txnrate30)-        ,("Transactions last 7 days", printf "%d (%0.1f per day)" tnum7 txnrate7)-        ,("Payees/descriptions", show $ length $ nub $ map tdescription ts)-        ,("Accounts", printf "%d (depth %d)" acctnum acctdepth)-        ,("Commodities", printf "%s (%s)" (show $ length cs) (intercalate ", " cs))-      -- Transactions this month     : %(monthtxns)s (last month in the same period: %(lastmonthtxns)s)-      -- Uncleared transactions      : %(uncleared)s-      -- Days since reconciliation   : %(reconcileelapsed)s-      -- Days since last transaction : %(recentelapsed)s-       ]-           where-             ts = sortBy (comparing tdate) $ filter (spanContainsDate span . tdate) $ jtxns $ journal l-             as = nub $ map paccount $ concatMap tpostings ts-             cs = Map.keys $ canonicaliseCommodities $ nub $ map commodity $ concatMap amounts $ map pamount $ concatMap tpostings ts-             lastdate | null ts = Nothing-                      | otherwise = Just $ tdate $ last ts-             lastelapsed = maybe Nothing (Just . diffDays today) lastdate-             showelapsed Nothing = ""-             showelapsed (Just days) = printf " (%d %s)" days' direction-                                       where days' = abs days-                                             direction | days >= 0 = "days ago"-                                                       | otherwise = "days from now"-             tnum = length ts-             start (DateSpan (Just d) _) = show d-             start _ = ""-             end (DateSpan _ (Just d)) = show d-             end _ = ""-             days = fromMaybe 0 $ daysInSpan span-             txnrate | days==0 = 0-                     | otherwise = fromIntegral tnum / fromIntegral days :: Double-             tnum30 = length $ filter withinlast30 ts-             withinlast30 t = d >= addDays (-30) today && (d<=today) where d = tdate t-             txnrate30 = fromIntegral tnum30 / 30 :: Double-             tnum7 = length $ filter withinlast7 ts-             withinlast7 t = d >= addDays (-7) today && (d<=today) where d = tdate t-             txnrate7 = fromIntegral tnum7 / 7 :: Double-             acctnum = length as-             acctdepth | null as = 0-                       | otherwise = maximum $ map accountNameLevel as-

@@ -1,379 +0,0 @@-{-| --A simple text UI for hledger, based on the vty library.---}--module Hledger.Cli.Commands.Vty-where-import Safe (headDef)-import Graphics.Vty-import Hledger.Data-import Hledger.Cli.Options-import Hledger.Cli.Commands.Balance-import Hledger.Cli.Commands.Register-import Hledger.Cli.Commands.Print---helpmsg = "(b)alance, (r)egister, (p)rint, (right) to drill down, (left) to back up, (q)uit"--instance Show Vty where show = const "a Vty"---- | The application state when running the vty command.-data AppState = AppState {-     av :: Vty                   -- ^ the vty context-    ,aw :: Int                  -- ^ window width-    ,ah :: Int                  -- ^ window height-    ,amsg :: String              -- ^ status message-    ,aopts :: [Opt]              -- ^ command-line opts-    ,aargs :: [String]           -- ^ command-line args at startup-    ,ajournal :: Journal         -- ^ parsed journal-    ,abuf :: [String]            -- ^ lines of the current buffered view-    ,alocs :: [Loc]              -- ^ user's navigation trail within the UI-                                -- ^ never null, head is current location-    } deriving (Show)---- | A location within the user interface.-data Loc = Loc {-     scr :: Screen               -- ^ one of the available screens-    ,sy :: Int                   -- ^ viewport y scroll position-    ,cy :: Int                   -- ^ cursor y position-    ,largs :: [String]           -- ^ command-line args, possibly narrowed for this location-    } deriving (Show)---- | The screens available within the user interface.-data Screen = BalanceScreen     -- ^ like hledger balance, shows accounts-            | RegisterScreen    -- ^ like hledger register, shows transaction-postings-            | PrintScreen       -- ^ like hledger print, shows journal transactions-            -- | LedgerScreen      -- ^ shows the raw journal-              deriving (Eq,Show)---- | Run the vty (curses-style) ui.-vty :: [Opt] -> [String] -> Journal -> IO ()-vty opts args j = do-  v <- mkVty-  DisplayRegion w h <- display_bounds $ terminal v-  let opts' = SubTotal:opts-  t <-  getCurrentLocalTime-  let a = enter t BalanceScreen args-          AppState {-                  av=v-                 ,aw=fromIntegral w-                 ,ah=fromIntegral h-                 ,amsg=helpmsg-                 ,aopts=opts'-                 ,aargs=args-                 ,ajournal=j-                 ,abuf=[]-                 ,alocs=[]-                 }-  go a ---- | Update the screen, wait for the next event, repeat.-go :: AppState -> IO ()-go a@AppState{av=av,aopts=opts} = do-  when (notElem DebugVty opts) $ update av (renderScreen a)-  k <- next_event av-  t <- getCurrentLocalTime-  case k of -    EvResize x y                -> go $ resize x y a-    EvKey (KASCII 'l') [MCtrl]  -> refresh av >> go a{amsg=helpmsg}-    EvKey (KASCII 'b') []       -> go $ resetTrailAndEnter t BalanceScreen a-    EvKey (KASCII 'r') []       -> go $ resetTrailAndEnter t RegisterScreen a-    EvKey (KASCII 'p') []       -> go $ resetTrailAndEnter t PrintScreen a-    EvKey KRight []             -> go $ drilldown t a-    EvKey KEnter []             -> go $ drilldown t a-    EvKey KLeft  []             -> go $ backout t a-    EvKey KUp    []             -> go $ moveUpAndPushEdge a-    EvKey KDown  []             -> go $ moveDownAndPushEdge a-    EvKey KHome  []             -> go $ moveToTop a-    EvKey KUp    [MCtrl]        -> go $ moveToTop a-    EvKey KUp    [MShift]       -> go $ moveToTop a-    EvKey KEnd   []             -> go $ moveToBottom a-    EvKey KDown  [MCtrl]        -> go $ moveToBottom a-    EvKey KDown  [MShift]       -> go $ moveToBottom a-    EvKey KPageUp []            -> go $ prevpage a-    EvKey KBS []                -> go $ prevpage a-    EvKey (KASCII ' ') [MShift] -> go $ prevpage a-    EvKey KPageDown []          -> go $ nextpage a-    EvKey (KASCII ' ') []       -> go $ nextpage a-    EvKey (KASCII 'q') []       -> shutdown av >> return ()---    EvKey KEsc   []           -> shutdown av >> return ()-    _                           -> go a---- app state modifiers---- | The number of lines currently available for the main data display area.-pageHeight :: AppState -> Int-pageHeight a = ah a - 1--setLocCursorY, setLocScrollY :: Int -> Loc -> Loc-setLocCursorY y l = l{cy=y}-setLocScrollY y l = l{sy=y}--cursorY, scrollY, posY :: AppState -> Int-cursorY = cy . loc-scrollY = sy . loc-posY a = scrollY a + cursorY a--setCursorY, setScrollY, setPosY :: Int -> AppState -> AppState-setCursorY _ AppState{alocs=[]} = error' "shouldn't happen" -- silence warnings-setCursorY y a@AppState{alocs=(l:locs)} = a{alocs=(l':locs)} where l' = setLocCursorY y l--setScrollY _ AppState{alocs=[]} = error' "shouldn't happen" -- silence warnings-setScrollY y a@AppState{alocs=(l:locs)} = a{alocs=(l':locs)} where l' = setLocScrollY y l--setPosY _ AppState{alocs=[]}    = error' "shouldn't happen" -- silence warnings-setPosY y a@AppState{alocs=(l:locs)} = a{alocs=(l':locs)}-    where -      l' = setLocScrollY sy $ setLocCursorY cy l-      ph = pageHeight a-      cy = y `mod` ph-      sy = y - cy--updateCursorY, updateScrollY, updatePosY :: (Int -> Int) -> AppState -> AppState-updateCursorY f a = setCursorY (f $ cursorY a) a-updateScrollY f a = setScrollY (f $ scrollY a) a-updatePosY f a = setPosY (f $ posY a) a--resize :: Int -> Int -> AppState -> AppState-resize x y a = setCursorY cy' a{aw=x,ah=y}-    where-      cy = cursorY a-      cy' = min cy (y-2)--moveToTop :: AppState -> AppState-moveToTop = setPosY 0--moveToBottom :: AppState -> AppState-moveToBottom a = setPosY (length $ abuf a) a--moveUpAndPushEdge :: AppState -> AppState-moveUpAndPushEdge a-    | cy > 0 = updateCursorY (subtract 1) a-    | sy > 0 = updateScrollY (subtract 1) a-    | otherwise = a-    where Loc{sy=sy,cy=cy} = head $ alocs a--moveDownAndPushEdge :: AppState -> AppState-moveDownAndPushEdge a-    | sy+cy >= bh = a-    | cy < ph-1 = updateCursorY (+1) a-    | otherwise = updateScrollY (+1) a-    where -      Loc{sy=sy,cy=cy} = head $ alocs a-      ph = pageHeight a-      bh = length $ abuf a---- | Scroll down by page height or until we can just see the last line,--- without moving the cursor, or if we are already scrolled as far as--- possible then move the cursor to the last line.-nextpage :: AppState -> AppState-nextpage (a@AppState{abuf=b})-    | sy < bh-jump = setScrollY sy' a-    | otherwise    = setCursorY (bh-sy) a-    where-      sy = scrollY a-      jump = pageHeight a - 1-      bh = length b-      sy' = min (sy+jump) (bh-jump)---- | Scroll up by page height or until we can just see the first line,--- without moving the cursor, or if we are scrolled as far as possible--- then move the cursor to the first line.-prevpage :: AppState -> AppState-prevpage a-    | sy > 0    = setScrollY sy' a-    | otherwise = setCursorY 0 a-    where-      sy = scrollY a-      jump = pageHeight a - 1-      sy' = max (sy-jump) 0---- | Push a new UI location on to the stack.-pushLoc :: Loc -> AppState -> AppState-pushLoc l a = a{alocs=(l:alocs a)}--popLoc :: AppState -> AppState-popLoc a@AppState{alocs=locs}-    | length locs > 1 = a{alocs=drop 1 locs}-    | otherwise = a--clearLocs :: AppState -> AppState-clearLocs a = a{alocs=[]}--exit :: AppState -> AppState -exit = popLoc--loc :: AppState -> Loc-loc = head . alocs---- | Get the filter pattern args in effect for the current ui location.-currentArgs :: AppState -> [String]-currentArgs (AppState {alocs=Loc{largs=as}:_}) = as-currentArgs (AppState {aargs=as}) = as--screen :: AppState -> Screen-screen a = scr where (Loc scr _ _ _) = loc a---- | Enter a new screen, with possibly new args, adding the new ui location to the stack.-enter :: LocalTime -> Screen -> [String] -> AppState -> AppState-enter t scr@BalanceScreen args a  = updateData t $ pushLoc Loc{scr=scr,sy=0,cy=0,largs=args} a-enter t scr@RegisterScreen args a = updateData t $ pushLoc Loc{scr=scr,sy=0,cy=0,largs=args} a-enter t scr@PrintScreen args a    = updateData t $ pushLoc Loc{scr=scr,sy=0,cy=0,largs=args} a--resetTrailAndEnter :: LocalTime -> Screen -> AppState -> AppState-resetTrailAndEnter t scr a = enter t scr (aargs a) $ clearLocs a---- | Regenerate the display data appropriate for the current screen.-updateData :: LocalTime -> AppState -> AppState-updateData t a@AppState{aopts=opts,ajournal=j} =-    case screen a of-      BalanceScreen  -> a{abuf=lines $ balanceReportAsText opts $ balanceReport opts fspec j}-      RegisterScreen -> a{abuf=lines $ registerReportAsText opts $ registerReport opts fspec j}-      PrintScreen    -> a{abuf=lines $ showTransactions fspec j}-    where fspec = optsToFilterSpec opts (currentArgs a) t--backout :: LocalTime -> AppState -> AppState-backout t a | screen a == BalanceScreen = a-            | otherwise = updateData t $ popLoc a--drilldown :: LocalTime -> AppState -> AppState-drilldown t a =-    case screen a of-      BalanceScreen  -> enter t RegisterScreen [currentAccountName a] a-      RegisterScreen -> scrollToTransaction e $ enter t PrintScreen (currentArgs a) a-      PrintScreen   -> a-    where e = currentTransaction a---- | Get the account name currently highlighted by the cursor on the--- balance screen. Results undefined while on other screens.-currentAccountName :: AppState -> AccountName-currentAccountName a = accountNameAt (abuf a) (posY a)---- | Get the full name of the account being displayed at a specific line--- within the balance command's output.-accountNameAt :: [String] -> Int -> AccountName-accountNameAt buf lineno = accountNameFromComponents anamecomponents-    where-      namestohere = map (drop 22) $ take (lineno+1) buf-      (indented, nonindented) = span (" " `isPrefixOf`) $ reverse namestohere-      thisbranch = indented ++ take 1 nonindented-      anamecomponents = reverse $ map strip $ dropsiblings thisbranch-      dropsiblings :: [AccountName] -> [AccountName]-      dropsiblings [] = []-      dropsiblings (x:xs) = x : dropsiblings xs'-          where-            xs' = dropWhile moreindented xs-            moreindented = (>= myindent) . indentof-            myindent = indentof x-            indentof = length . takeWhile (==' ')---- | If on the print screen, move the cursor to highlight the specified entry--- (or a reasonable guess). Doesn't work.-scrollToTransaction :: Maybe Transaction -> AppState -> AppState-scrollToTransaction Nothing a = a-scrollToTransaction (Just t) a@AppState{abuf=buf} = setCursorY cy $ setScrollY sy a-    where-      entryfirstline = head $ lines $ showTransaction t-      halfph = pageHeight a `div` 2-      y = fromMaybe 0 $ findIndex (== entryfirstline) buf-      sy = max 0 $ y - halfph-      cy = y - sy---- | Get the transaction containing the posting currently highlighted by--- the cursor on the register screen (or best guess). Results undefined--- while on other screens.-currentTransaction :: AppState -> Maybe Transaction-currentTransaction a@AppState{ajournal=j,abuf=buf} = ptransaction p-    where-      p = headDef nullposting $ filter ismatch $ journalPostings j-      ismatch p = postingDate p == parsedate (take 10 datedesc)-                  && take 70 (showPostingWithBalanceForVty False p nullmixedamt) == (datedesc ++ acctamt)-      datedesc = take 32 $ fromMaybe "" $ find (not . (" " `isPrefixOf`)) $ headDef "" rest : reverse above-      acctamt = drop 32 $ headDef "" rest-      (above,rest) = splitAt y buf-      y = posY a---- renderers--renderScreen :: AppState -> Picture-renderScreen (a@AppState{aw=w,ah=h,abuf=buf,amsg=msg}) =-    Picture {pic_cursor = Cursor (fromIntegral cx) (fromIntegral cy)-            ,pic_image = mainimg-                         <->-                         renderStatus w msg-            ,pic_background = Background ' ' def_attr-            }-    where -      (cx, cy) = (0, cursorY a)-      sy = scrollY a---       mainimg = (renderString attr $ unlines $ above)---           <->---           (renderString reverseattr $ thisline)---           <->---           (renderString attr $ unlines $ below)---       (above,(thisline:below))---           | null ls   = ([],[""])---           | otherwise = splitAt y ls---       ls = lines $ fitto w (h-1) $ unlines $ drop as $ buf--- trying for more speed-      mainimg = vert_cat (map (string defaultattr) above)-               <->-               string currentlineattr thisline-               <->-               vert_cat (map (string defaultattr) below)-      (thisline,below) | null rest = (blankline,[])-                       | otherwise = (head rest, tail rest)-      (above,rest) = splitAt cy linestorender-      linestorender = map padclipline $ take (h-1) $ drop sy $ buf ++ replicate h blankline-      padclipline = take w . (++ blankline)-      blankline = replicate w ' '--padClipString :: Int -> Int -> String -> [String]-padClipString h w s = rows-    where-      rows = map padclipline $ take h $ lines s ++ replicate h blankline-      padclipline = take w . (++ blankline)-      blankline = replicate w ' '--renderString :: Attr -> String -> Image-renderString attr s = vert_cat $ map (string attr) rows-    where-      rows = lines $ fitto w h s-      w = maximum $ map length ls-      h = length ls-      ls = lines s--renderStatus :: Int -> String -> Image-renderStatus w = string statusattr . take w . (++ repeat ' ')---- the all-important theming engine!--theme = Restrained--data UITheme = Restrained | Colorful | Blood--(defaultattr, - currentlineattr, - statusattr- ) = case theme of-       Restrained -> (def_attr-                    ,def_attr `with_style` bold-                    ,def_attr `with_style` reverse_video-                    )-       Colorful   -> (def_attr `with_style` reverse_video-                    ,def_attr `with_fore_color` white `with_back_color` red-                    ,def_attr `with_fore_color` black `with_back_color` green-                    )-       Blood      -> (def_attr `with_style` reverse_video-                    ,def_attr `with_fore_color` white `with_back_color` red-                    ,def_attr `with_style` reverse_video-                    )--halfbrightattr = def_attr `with_style` dim-reverseattr = def_attr `with_style` reverse_video-redattr = def_attr `with_fore_color` red-greenattr = def_attr `with_fore_color` green-reverseredattr = def_attr `with_style` reverse_video `with_fore_color` red-reversegreenattr= def_attr `with_style` reverse_video `with_fore_color` green

@@ -1,890 +0,0 @@-{-# LANGUAGE CPP, TypeFamilies, QuasiQuotes, TemplateHaskell #-}-{-# LANGUAGE TypeSynonymInstances, FlexibleInstances, MultiParamTypeClasses, FlexibleContexts #-}-{-| -A web-based UI.--}--module Hledger.Cli.Commands.Web-where-import Control.Concurrent (forkIO, threadDelay)-import Control.Applicative ((<$>), (<*>))-import Control.Failure-import Data.Either-import System.FilePath ((</>), takeFileName)-import System.IO.Storage (withStore, putValue, getValue)-import Text.ParserCombinators.Parsec (parse)-import Yesod-import Yesod.Helpers.Static-import Text.Hamlet-import Text.Hamlet.RT--import Hledger.Cli.Commands.Add (journalAddTransaction)-import Hledger.Cli.Commands.Balance-import Hledger.Cli.Commands.Print-import Hledger.Cli.Commands.Register-import Hledger.Cli.Options hiding (value)-import Hledger.Cli.Utils-import Hledger.Cli.Version (version)-import Hledger.Data hiding (today)-import Hledger.Read (journalFromPathAndString)-import Hledger.Read.Journal (someamount)-#ifdef MAKE-import Paths_hledger_make (getDataFileName)-#else-import Paths_hledger (getDataFileName)-#endif---defhost           = "localhost"-defport           = 5000-browserstartdelay = 100000 -- microseconds-hledgerorgurl     = "http://hledger.org"-manualurl         = hledgerorgurl++"/MANUAL.html"--data HledgerWebApp = HledgerWebApp {-      appRoot    :: String-     ,appDir     :: FilePath-     ,appOpts    :: [Opt]-     ,appArgs    :: [String]-     ,appJournal :: Journal-     ,appStatic  :: Static-     }--type Handler = GHandler HledgerWebApp HledgerWebApp--mkYesod "HledgerWebApp" [$parseRoutes|-/static          StaticR           Static appStatic-/                IndexR            GET-/journalonly     JournalOnlyR      GET POST-/registeronly    RegisterOnlyR     GET-/accounts        AccountsOnlyR     GET-/journal         JournalR          GET POST-/register        RegisterR         GET POST-/addformrt       AddformRTR        GET-|]--style_css       = StaticRoute ["style.css"] []-hledger_js      = StaticRoute ["hledger.js"] []-jquery_js       = StaticRoute ["jquery.js"] []-jquery_url_js   = StaticRoute ["jquery.url.js"] []-dhtmlxcommon_js = StaticRoute ["dhtmlxcommon.js"] []-dhtmlxcombo_js  = StaticRoute ["dhtmlxcombo.js"] []--instance Yesod HledgerWebApp where approot = appRoot--defaultroute = JournalR---- | A bundle of useful data passed to templates.-data TemplateData = TD {-     here         :: HledgerWebAppRoute -- ^ the current page's route-    ,title        :: String             -- ^ page's title-    ,msg          :: Maybe Html         -- ^ transient message-    ,a            :: String             -- ^ a (acct/desc filter pattern) parameter-    ,p            :: String             -- ^ p (period expression) parameter-    ,j            :: Journal            -- ^ the current journal-    ,today        :: Day                -- ^ the current day-    }--mktd = TD {-      here = IndexR-     ,title = "hledger"-     ,msg = Nothing-     ,a = ""-     ,p = ""-     ,j = nulljournal-     ,today = ModifiedJulianDay 0-     }---- | The web command.-web :: [Opt] -> [String] -> Journal -> IO ()-web opts args j = do-  let host    = defhost-      port    = fromMaybe defport $ portFromOpts opts-      baseurl = fromMaybe (printf "http://%s:%d" host port) $ baseUrlFromOpts opts-  unless (Debug `elem` opts) $ forkIO (browser baseurl) >> return ()-  server baseurl port opts args j--browser :: String -> IO ()-browser baseurl = do-  putStrLn "starting web browser"-  threadDelay browserstartdelay-  openBrowserOn baseurl-  return ()--server :: String -> Int -> [Opt] -> [String] -> Journal -> IO ()-server baseurl port opts args j = do-    printf "starting web server on port %d with base url %s\n" port baseurl-    dir <- getDataFileName "web"-    let app = HledgerWebApp{-               appRoot=baseurl-              ,appDir=dir-              ,appStatic=fileLookupDir (dir </> "static") $ typeByExt -- ++[("hamlet","text/plain")]-              ,appOpts=opts-              ,appArgs=args-              ,appJournal=j-              }-    withStore "hledger" $ do-     putValue "hledger" "journal" j-     basicHandler' port Nothing app---- | Gather all the stuff we want for a typical hledger web request handler.-getHandlerParameters :: Handler-                       (String, String, [Opt], FilterSpec, Journal, Maybe Html, HledgerWebAppRoute)-getHandlerParameters = do-  Just here <- getCurrentRoute-  (a, p, opts, fspec) <- getReportParameters-  (j, err) <- getLatestJournal opts-  msg <- getMessage' err-  return (a, p, opts, fspec, j, msg, here)-    where-      -- | Get current report parameters for this request.-      getReportParameters :: Handler (String, String, [Opt], FilterSpec)-      getReportParameters = do-          app <- getYesod-          t <- liftIO $ getCurrentLocalTime-          a <- fromMaybe "" <$> lookupGetParam "a"-          p <- fromMaybe "" <$> lookupGetParam "p"-          let opts = appOpts app ++ [Period p]-              args = appArgs app ++ [a]-              fspec = optsToFilterSpec opts args t-          return (a, p, opts, fspec)--      -- | Update our copy of the journal if the file changed. If there is an-      -- error while reloading, keep the old one and return the error, and set a-      -- ui message.-      getLatestJournal :: [Opt] -> Handler (Journal, Maybe String)-      getLatestJournal opts = do-        j <- liftIO $ fromJust `fmap` getValue "hledger" "journal"-        (jE, changed) <- liftIO $ journalReloadIfChanged opts j-        if not changed-         then return (j,Nothing)-         else case jE of-                Right j' -> do liftIO $ putValue "hledger" "journal" j'-                               return (j',Nothing)-                Left e  -> do setMessage $ string "error while reading" {- ++ ": " ++ e-}-                              return (j, Just e)--      -- | Helper to work around a yesod feature (can't set and get a message in the same request.)-      getMessage' :: Maybe String -> Handler (Maybe Html)-      getMessage' newmsgstr = do-        oldmsg <- getMessage-        return $ maybe oldmsg (Just . string) newmsgstr--------------------------------------------------------------------------- handlers & templates--getIndexR :: Handler ()-getIndexR = redirect RedirectTemporary defaultroute---------------------------------------------------------------------------- | A combined accounts and journal view.-getJournalR :: Handler RepHtml-getJournalR = do-  (a, p, opts, fspec, j, msg, here) <- getHandlerParameters-  today <- liftIO getCurrentDay-  -- app <- getYesod-  -- t <- liftIO $ getCurrentLocalTime-  let -- args = appArgs app-      -- fspec' = optsToFilterSpec opts args t-      br = balanceReportAsHtml opts td $ balanceReport opts fspec j-      jr = journalReportAsHtml opts td $ journalReport opts fspec j-      td = mktd{here=here, title="hledger journal", msg=msg, a=a, p=p, j=j, today=today}-      editform' = editform td $ jtext j-  hamletToRepHtml $ pageLayout td [$hamlet|-%div.ledger- %div.accounts!style=float:left;  ^br^- ^navlinks.td^- ^addform.td^- ^editform'^- ^importform^- %div#transactions.journal-  ^filterform.td^-  ^jr^-|]--postJournalR :: Handler RepPlain-postJournalR = postJournalOnlyR---------------------------------------------------------------------------- | A combined accounts and register view.-getRegisterR :: Handler RepHtml-getRegisterR = do-  (a, p, opts, fspec, j, msg, here) <- getHandlerParameters-  today <- liftIO getCurrentDay-  -- app <- getYesod-  -- t <- liftIO $ getCurrentLocalTime-  let -- args = appArgs app-      -- opts' = Empty:opts-      -- fspec' = optsToFilterSpec opts' args t-      br = balanceReportAsHtml opts td $ balanceReport opts fspec j-      rr = registerReportAsHtml opts td $ registerReport opts fspec j-      td = mktd{here=here, title="hledger register", msg=msg, a=a, p=p, j=j, today=today}-      editform' = editform td $ jtext j-  hamletToRepHtml $ pageLayout td [$hamlet|-%div.ledger- %div.accounts!style=float:left;  ^br^- ^navlinks.td^- ^addform.td^- ^editform'^- ^importform^- %div#transactions.register-  ^filterform.td^-  ^rr^-|]--postRegisterR :: Handler RepPlain-postRegisterR = postJournalOnlyR---------------------------------------------------------------------------- | A simple accounts and balances view like hledger balance.-getAccountsOnlyR :: Handler RepHtml-getAccountsOnlyR = do-  (a, p, opts, fspec, j, msg, here) <- getHandlerParameters-  today <- liftIO getCurrentDay-  let td = mktd{here=here, title="hledger accounts", msg=msg, a=a, p=p, j=j, today=today}-  hamletToRepHtml $ pageLayout td $ balanceReportAsHtml opts td $ balanceReport opts fspec j---- | Render a balance report as HTML.-balanceReportAsHtml :: [Opt] -> TemplateData -> BalanceReport -> Hamlet HledgerWebAppRoute-balanceReportAsHtml _ td@TD{here=here,a=a,p=p} (items,total) = [$hamlet|-%table.balancereport- %tr-  %td-   ^accountsheading^- $forall items i-  ^itemAsHtml' i^- %tr.totalrule-  %td!colspan=2- %tr-  %td-  %td!align=right $mixedAmountAsHtml.total$-|]- where-   accountsheading = [$hamlet|-                      accounts-                      \ $-                      %span#showmoreaccounts ^showmore^ ^showall^-                      <br />-                      <br />-                      |]-       where-         filteringaccts = not $ null a-         showmore = case (filteringaccts, items) of-                      -- cunning parent account logic-                      (True, ((acct, _, _, _):_)) ->-                          let a' = if isAccountRegex a then a else acct-                              a'' = accountNameToAccountRegex $ parentAccountName $ accountRegexToAccountName a'-                              parenturl = (here, [("a",a''), ("p",p)])-                          in [$hamlet|-                              \ | $-                              %a!href=@?parenturl@ show more &uarr;-                              |]-                      _ -> nulltemplate-         showall = if filteringaccts-                    then [$hamlet|-                          \ | $-                          %a!href=@?allurl@ show all-                          |]-                    else nulltemplate-             where allurl = (here, [("p",p)])-   itemAsHtml' = itemAsHtml td-   itemAsHtml :: TemplateData -> BalanceReportItem -> Hamlet HledgerWebAppRoute-   itemAsHtml TD{p=p} (acct, adisplay, adepth, abal) = [$hamlet|-     %tr.item.$current$-      %td.account-       $indent$-       %a!href=$aurl$ $adisplay$-      %td.balance!align=right $mixedAmountAsHtml.abal$-     |] where-       current = "" -- if not (null a) && containsRegex a acct then "current" else ""-       indent = preEscapedString $ concat $ replicate (2 * adepth) "&nbsp;"-       aurl = printf ".?a=%s%s" (accountNameToAccountRegex acct) p' :: String-       p' = if null p then "" else printf "&p=%s" p--accountNameToAccountRegex :: String -> String-accountNameToAccountRegex "" = ""-accountNameToAccountRegex a = printf "^%s(:|$)" a--accountRegexToAccountName :: String -> String-accountRegexToAccountName = gsubRegexPR "^\\^(.*?)\\(:\\|\\$\\)$" "\\1"--isAccountRegex  :: String -> Bool-isAccountRegex s = take 1 s == "^" && (take 5 $ reverse s) == ")$|:("---------------------------------------------------------------------------- | A basic journal view, like hledger print, with editing.-getJournalOnlyR :: Handler RepHtml-getJournalOnlyR = do-  (a, p, opts, fspec, j, msg, here) <- getHandlerParameters-  today <- liftIO getCurrentDay-  let td = mktd{here=here, title="hledger journal", msg=msg, a=a, p=p, j=j, today=today}-      editform' = editform td $ jtext j-      txns = journalReportAsHtml opts td $ journalReport opts fspec j-  hamletToRepHtml $ pageLayout td [$hamlet|-%div.journal- %div.nav2-  %a#addformlink!href!onclick="return addformToggle()" add one transaction-  \ | $-  %a#editformlink!href!onclick="return editformToggle()" edit the whole journal- ^addform.td^- ^editform'^- #transactions ^txns^-|]---- | Render a journal report as HTML.-journalReportAsHtml :: [Opt] -> TemplateData -> JournalReport -> Hamlet HledgerWebAppRoute-journalReportAsHtml _ td items = [$hamlet|-%table.journalreport- $forall number.items i-  ^itemAsHtml' i^-|]- where-   number = zip [1..]-   itemAsHtml' = itemAsHtml td-   itemAsHtml :: TemplateData -> (Int, JournalReportItem) -> Hamlet HledgerWebAppRoute-   itemAsHtml _ (n, t) = [$hamlet|-     %tr.item.$evenodd$-      %td.transaction-       %pre $txn$-     |] where-       evenodd = if even n then "even" else "odd"-       txn = trimnl $ showTransaction t where trimnl = reverse . dropWhile (=='\n') . reverse--addform :: TemplateData -> Hamlet HledgerWebAppRoute-addform td = [$hamlet|-%script!type=text/javascript- $$(document).ready(function() {-    /* dhtmlxcombo setup */-    window.dhx_globalImgPath="../static/images/";-    var desccombo  = new dhtmlXCombo("description");-    var acct1combo = new dhtmlXCombo("account1");-    var acct2combo = new dhtmlXCombo("account2");-    desccombo.enableFilteringMode(true);-    acct1combo.enableFilteringMode(true);-    acct2combo.enableFilteringMode(true);-    desccombo.setSize(300);-    acct1combo.setSize(300);-    acct2combo.setSize(300);-    /* desccombo.enableOptionAutoHeight(true, 20); */-    /* desccombo.setOptionHeight(200); */- });-%form#addform!method=POST!style=display:none;-  %table.form-   %tr-    %td!colspan=4-     %table-      %tr#descriptionrow-       %td-        Date:-       %td-        %input.textinput!size=15!name=date!value=$date$-       %td!style=padding-left:1em;-        Description:-       %td-        %select!id=description!name=description-         %option-         $forall descriptions d-          %option!value=$d$ $d$-      %tr.helprow-       %td-       %td-        .help $datehelp$ $-       %td-       %td-        .help $deschelp$-   ^postingsfields.td^-   %tr#addbuttonrow-    %td!colspan=4-     %input!type=hidden!name=action!value=add-     %input!type=submit!name=submit!value="add transaction"-|]- where-  -- datehelplink = helplink "dates" "..."-  datehelp = "eg: 2010/7/20"-  deschelp = "eg: supermarket (optional)"-  date = "today"-  descriptions = sort $ nub $ map tdescription $ jtxns $ j td--postingsfields :: TemplateData -> Hamlet HledgerWebAppRoute-postingsfields td = [$hamlet|- ^p1^- ^p2^-|]-  where-    p1 = postingfields td 1-    p2 = postingfields td 2--postingfields :: TemplateData -> Int -> Hamlet HledgerWebAppRoute-postingfields td n = [$hamlet|- %tr#postingrow-  %td!align=right $acctlabel$:-  %td-   %select!id=$acctvar$!name=$acctvar$-    %option-    $forall acctnames a-     %option!value=$a$ $a$-  ^amtfield^- %tr.helprow-  %td-  %td-   .help $accthelp$-  %td-  %td-   .help $amthelp$-|]- where-  numbered = (++ show n)-  acctvar = numbered "account"-  amtvar = numbered "amount"-  acctnames = sort $ journalAccountNamesUsed $ j td-  (acctlabel, accthelp, amtfield, amthelp)-       | n == 1     = ("To account"-                     ,"eg: expenses:food"-                     ,[$hamlet|-                       %td!style=padding-left:1em;-                        Amount:-                       %td-                        %input.textinput!size=15!name=$amtvar$!value=""-                       |]-                     ,"eg: $6"-                     )-       | otherwise = ("From account"-                     ,"eg: assets:bank:checking"-                     ,nulltemplate-                     ,""-                     )--editform :: TemplateData -> String -> Hamlet HledgerWebAppRoute-editform _ content = [$hamlet|- %form#editform!method=POST!style=display:none;-  %table.form#editform-   %tr-    %td!colspan=2-     %textarea!name=text!rows=30!cols=80-      $content$-   %tr#addbuttonrow-    %td-     %span.help ^formathelp^-    %td!align=right-     %span.help Are you sure ? This will overwrite the journal. $-     %input!type=hidden!name=action!value=edit-     %input!type=submit!name=submit!value="save journal"-     \ or $-     %a!href!onclick="return editformToggle()" cancel-|]-  where-    formathelp = helplink "file-format" "file format help"--importform :: Hamlet HledgerWebAppRoute-importform = [$hamlet|- %form#importform!method=POST!style=display:none;-  %table.form-   %tr-    %td-     %input!type=file!name=file-     %input!type=hidden!name=action!value=import-     %input!type=submit!name=submit!value="import from file"-     \ or $-     %a!href!onclick="return importformToggle()" cancel-|]--postJournalOnlyR :: Handler RepPlain-postJournalOnlyR = do-  action <- runFormPost' $ maybeStringInput "action"-  case action of Just "edit"   -> postEditForm-                 Just "import" -> postImportForm-                 _             -> postAddForm---- | Handle a journal add form post.-postAddForm :: Handler RepPlain-postAddForm = do-  (_, _, opts, _, _, _, _) <- getHandlerParameters-  today <- liftIO getCurrentDay-  -- get form input values. M means a Maybe value.-  (dateM, descM, acct1M, amt1M, acct2M, amt2M) <- runFormPost'-    $ (,,,,,)-    <$> maybeStringInput "date"-    <*> maybeStringInput "description"-    <*> maybeStringInput "account1"-    <*> maybeStringInput "amount1"-    <*> maybeStringInput "account2"-    <*> maybeStringInput "amount2"-  -- supply defaults and parse date and amounts, or get errors.-  let dateE = maybe (Left "date required") (either (\e -> Left $ showDateParseError e) Right . fixSmartDateStrEither today) dateM-      descE = Right $ fromMaybe "" descM-      acct1E = maybe (Left "to account required") Right acct1M-      acct2E = maybe (Left "from account required") Right acct2M-      amt1E = maybe (Left "amount required") (either (const $ Left "could not parse amount") Right . parse someamount "") amt1M-      amt2E = maybe (Right missingamt)       (either (const $ Left "could not parse amount") Right . parse someamount "") amt2M-      strEs = [dateE, descE, acct1E, acct2E]-      amtEs = [amt1E, amt2E]-      [date,desc,acct1,acct2] = rights strEs-      [amt1,amt2] = rights amtEs-      errs = lefts strEs ++ lefts amtEs-      -- if no errors so far, generate a transaction and balance it or get the error.-      tE | not $ null errs = Left errs-         | otherwise = either (\e -> Left ["unbalanced postings: " ++ (head $ lines e)]) Right-                        (balanceTransaction $ nulltransaction {-                           tdate=parsedate date-                          ,teffectivedate=Nothing-                          ,tstatus=False-                          ,tcode=""-                          ,tdescription=desc-                          ,tcomment=""-                          ,tpostings=[-                            Posting False acct1 amt1 "" RegularPosting Nothing-                           ,Posting False acct2 amt2 "" RegularPosting Nothing-                           ]-                          ,tpreceding_comment_lines=""-                          })-  -- display errors or add transaction-  case tE of-   Left errs -> do-    -- save current form values in session-    setMessage $ string $ intercalate "; " errs-    redirect RedirectTemporary RegisterR--   Right t -> do-    let t' = txnTieKnot t -- XXX move into balanceTransaction-    j <- liftIO $ fromJust `fmap` getValue "hledger" "journal"-    liftIO $ journalAddTransaction j opts t'-    setMessage $ string $ printf "Added transaction:\n%s" (show t')-    redirect RedirectTemporary RegisterR---- | Handle a journal edit form post.-postEditForm :: Handler RepPlain-postEditForm = do-  -- get form input values, or basic validation errors. E means an Either value.-  textM  <- runFormPost' $ maybeStringInput "text"-  let textE = maybe (Left "No value provided") Right textM-  -- display errors or add transaction-  case textE of-   Left errs -> do-    -- XXX should save current form values in session-    setMessage $ string errs-    redirect RedirectTemporary JournalR--   Right t' -> do-    -- try to avoid unnecessary backups or saving invalid data-    j <- liftIO $ fromJust `fmap` getValue "hledger" "journal"-    filechanged' <- liftIO $ journalFileIsNewer j-    let f = filepath j-        told = jtext j-        tnew = filter (/= '\r') t'-        changed = tnew /= told || filechanged'---    changed <- liftIO $ writeFileWithBackupIfChanged f t''-    if not changed-     then do-       setMessage $ string $ "No change"-       redirect RedirectTemporary JournalR-     else do-      jE <- liftIO $ journalFromPathAndString Nothing f tnew-      either-       (\e -> do-          setMessage $ string e-          redirect RedirectTemporary JournalR)-       (const $ do-          liftIO $ writeFileWithBackup f tnew-          setMessage $ string $ printf "Saved journal %s\n" (show f)-          redirect RedirectTemporary JournalR)-       jE---- | Handle an import page post.-postImportForm :: Handler RepPlain-postImportForm = do-  setMessage $ string $ "can't handle file upload yet"-  redirect RedirectTemporary JournalR-  -- -- get form input values, or basic validation errors. E means an Either value.-  -- fileM <- runFormPost' $ maybeFileInput "file"-  -- let fileE = maybe (Left "No file provided") Right fileM-  -- -- display errors or import transactions-  -- case fileE of-  --  Left errs -> do-  --   setMessage $ string errs-  --   redirect RedirectTemporary JournalR--  --  Right s -> do-  --    setMessage $ string $ s-  --    redirect RedirectTemporary JournalR---------------------------------------------------------------------------- | A simple postings view like hledger register.-getRegisterOnlyR :: Handler RepHtml-getRegisterOnlyR = do-  (a, p, opts, fspec, j, msg, here) <- getHandlerParameters-  today <- liftIO getCurrentDay-  let td = mktd{here=here, title="hledger register", msg=msg, a=a, p=p, j=j, today=today}-  hamletToRepHtml $ pageLayout td $ registerReportAsHtml opts td $ registerReport opts fspec j---- | Render a register report as HTML.-registerReportAsHtml :: [Opt] -> TemplateData -> RegisterReport -> Hamlet HledgerWebAppRoute-registerReportAsHtml _ td items = [$hamlet|-%table.registerreport- %tr.headings-  ^headings^- $forall number.items i-  ^itemAsHtml' i^-|]- where-   number = zip [1..]-   headings = [$hamlet|-               %th.date!align=left Date-               %th.description!align=left Description-               %th.account!align=left Account-               %th.amount!align=right Amount-               %th.balance!align=right Balance-               |]-   itemAsHtml' = itemAsHtml td-   itemAsHtml :: TemplateData -> (Int, RegisterReportItem) -> Hamlet HledgerWebAppRoute-   itemAsHtml TD{p=p} (n, (ds, posting, b)) = [$hamlet|-     %tr.item.$evenodd$.$firstposting$-      %td.date $date$-      %td.description $desc$-      %td.account-       %a!href=$aurl$ $acct$-      %td.amount!align=right $mixedAmountAsHtml.pamount.posting$-      %td.balance!align=right $mixedAmountAsHtml.b$-     |] where-       evenodd = if even n then "even" else "odd"-       (firstposting, date, desc) = case ds of Just (da, de) -> ("firstposting", show da, de)-                                               Nothing -> ("", "", "")-       acct = paccount posting-       aurl = printf ".?a=%s%s" (accountNameToAccountRegex acct) p' :: String-       p' = if null p then "" else printf "&p=%s" p--mixedAmountAsHtml b = preEscapedString $ addclass $ intercalate "<br>" $ lines $ show b-    where addclass = printf "<span class=\"%s\">%s</span>" c-          c = case isNegativeMixedAmount b of Just True -> "negative amount"-                                              _         -> "positive amount"---------------------------------------------------------------------------- | A standalone journal edit form page.-getEditR :: Handler RepHtml-getEditR = do-  (a, p, _, _, _, msg, here) <- getHandlerParameters-  today <- liftIO getCurrentDay-  -- reload journal's text without parsing, if changed     -- XXX are we doing this right ?-  j <- liftIO $ fromJust `fmap` getValue "hledger" "journal"-  changed <- liftIO $ journalFileIsNewer j-  s <- liftIO $ if changed then readFile (filepath j) else return (jtext j) -- XXX readFile may throw an error-  let td = mktd{here=here, title="hledger journal edit", msg=msg, a=a, p=p, j=j, today=today}-  hamletToRepHtml $ pageLayout td $ editform td s---------------------------------------------------------------------------- | Get the add form from template files reloaded at run-time.-getAddformRTR :: Handler RepHtml-getAddformRTR = do-  (a, p, _, _, j, msg, here) <- getHandlerParameters-  today <- liftIO getCurrentDay-  let td = mktd{here=here, title="hledger add transaction", msg=msg, a=a, p=p, j=j, today=today}-      descriptions = sort $ nub $ map tdescription $ jtxns j-      acctnames = sort $ journalAccountNamesUsed j-      postingData n = [-                       (["acctlabel"], hdstring acctlabel)-                      ,(["acctvar"],   hdstring acctvar)-                      ,(["acctnames"], hdstringlist acctnames)-                      ,(["amtfield"],  HDHtml $ renderHamlet' amtfield)-                      ,(["accthelp"],  hdstring accthelp)-                      ,(["amthelp"],   hdstring amthelp)-                      ] :: HamletMap HledgerWebAppRoute-          where-            numbered = (++ show n)-            acctvar = numbered "account"-            amtvar = numbered "amount"-            (acctlabel, accthelp, amtfield, amthelp)-                | n == 1     = ("To account"-                              ,"eg: expenses:food"-                              ,[$hamlet|-                                %td!style=padding-left:1em;-                                 Amount:-                                %td-                                 %input.textinput!size=15!name=$amtvar$!value=""-                                |]-                              ,"eg: $6"-                              )-                | otherwise = ("From account"-                              ,"eg: assets:bank:checking"-                              ,nulltemplate-                              ,""-                              )-  pfields1 <- renderHamletFile "addformpostingfields.hamlet" (postingData 1)-  pfields2 <- renderHamletFile "addformpostingfields.hamlet" (postingData 2)-  addform  <- renderHamletFile "addform.hamlet" ([-                                                 (["date"], hdstring "today")-                                                ,(["desc"], hdstring "")-                                                ,(["descriptions"], hdstringlist descriptions)-                                                ,(["datehelp"], hdstring "eg: 2010/7/20")-                                                ,(["deschelp"], hdstring "eg: supermarket (optional)")-                                                ,(["postingfields1"], HDHtml pfields1)-                                                ,(["postingfields2"], HDHtml pfields2)-                                                ] :: HamletMap HledgerWebAppRoute)-  hamletToRepHtml $ pageLayout td $ htmlAsHamlet addform---- | Convert a string to a hamlet HDHtml data item.-hdstring :: String -> HamletData HledgerWebAppRoute-hdstring = HDHtml . string---- | Convert a simple list of strings to hamlet's complicated HDList type.-hdstringlist :: [String] -> HamletData HledgerWebAppRoute-hdstringlist ss = HDList [ [([], hdstring s)] | s <- ss ]--instance Failure HamletException Handler-    where failure = error' . show--renderHamletFile :: FilePath -> HamletMap HledgerWebAppRoute -> Handler Html-renderHamletFile hfile hmap = do-  hrt <- readHamletFile hfile >>= parseHamletRT defaultHamletSettings-  renderHamletRT hrt hmap renderurlwithparams--renderurlwithparams u [] = show u-renderurlwithparams u ps = show u ++ "?" ++ intercalate "&" [k++"="++v | (k,v) <- ps]--readHamletFile :: FilePath -> Handler String-readHamletFile hfile = do-  dir <- ((</> "templates") . appDir) `fmap` getYesod-  liftIO $ readFile $ dir </> hfile--htmlAsHamlet :: Html -> Hamlet HledgerWebAppRoute-htmlAsHamlet h = [$hamlet|$h$|]--parseHamletRT' :: Failure HamletException m => String -> m HamletRT-parseHamletRT' s = parseHamletRT defaultHamletSettings s--renderHamletRT' :: Failure HamletException m => HamletMap HledgerWebAppRoute -> HamletRT -> m Html-renderHamletRT' m h = renderHamletRT h m renderurlwithparams--renderHamlet' :: Hamlet HledgerWebAppRoute -> Html-renderHamlet' h = h renderurlwithparams---- hamletToHamletRT ::  Failure HamletException m => Hamlet HledgerWebAppRoute -> m HamletRT--- hamletToHamletRT h = stringToHamletRT $ show $ unsafeByteString $ renderHamlet show h---------------------------------------------------------------------------- | Wrap a template with the standard hledger web ui page layout.-pageLayout :: TemplateData -> Hamlet HledgerWebAppRoute -> Hamlet HledgerWebAppRoute-pageLayout td@TD{title=basetitle, msg=msg, p=p, j=j, today=today} content = [$hamlet|-!!!-%html- %head-  %title $title'$-  %meta!http-equiv=Content-Type!content=$metacontent$-  %script!type=text/javascript!src=@StaticR.jquery_js@-  %script!type=text/javascript!src=@StaticR.jquery_url_js@-  %script!type=text/javascript!src=@StaticR.dhtmlxcommon_js@-  %script!type=text/javascript!src=@StaticR.dhtmlxcombo_js@-  %script!type=text/javascript!src=@StaticR.hledger_js@-  %link!rel=stylesheet!type=text/css!media=all!href=@StaticR.style_css@- %body-  ^navbar.td^-  #messages $m$-  #content-   ^content^-|]- where m = fromMaybe (string "") msg-       metacontent = "text/html; charset=utf-8"-       (journaltitle, _) = journalTitleInfo j p today-       title' = basetitle ++ " - " ++ journaltitle--navbar :: TemplateData -> Hamlet HledgerWebAppRoute-navbar TD{p=p,j=j,today=today} = [$hamlet|- #navbar-  %a.topleftlink!href=$hledgerorgurl$-   hledger-   <br />-   $version$-  %a.toprightlink!href=$manualurl$!target=hledgerhelp manual-  %h1 $journaltitle$-  \ $-  %span#journalinfo $journalinfo$-|]-  where (journaltitle, journalinfo) = journalTitleInfo j p today---- | Generate journal- and context-specific title and info strings for display.-journalTitleInfo :: Journal -> String -> Day -> (String, String)-journalTitleInfo j p today = (journaltitle, journalinfo)-  where-    journaltitle = printf "%s" (takeFileName $ filepath j) :: String-    journalinfo  = printf "%s" (showspan span) :: String-    span = either (const $ DateSpan Nothing Nothing) snd (parsePeriodExpr today p)-    showspan (DateSpan Nothing Nothing) = ""-    showspan s = " (" ++ dateSpanAsText s ++ ")"--navlinks :: TemplateData -> Hamlet HledgerWebAppRoute-navlinks td = [$hamlet|- #navlinks-  ^accountsjournallink^-  \ | $-  ^accountsregisterlink^-  \ | $-  %a#addformlink!href!onclick="return addformToggle()" add transaction-  %a#importformlink!href!onclick="return importformToggle()"!style=display:none; import transactions-  \ | $-  %a#editformlink!href!onclick="return editformToggle()" edit journal-|]---  \ | $- where-   accountsjournallink  = navlink td "journal" JournalR-   accountsregisterlink = navlink td "register" RegisterR--navlink :: TemplateData -> String -> HledgerWebAppRoute -> Hamlet HledgerWebAppRoute-navlink TD{here=here,a=a,p=p} s dest = [$hamlet|%a#$s$link.$style$!href=@?u@ $s$|]- where u = (dest, concat [(if null a then [] else [("a", a)])-                         ,(if null p then [] else [("p", p)])])-       style | dest == here = "navlinkcurrent"-             | otherwise    = "navlink"--filterform :: TemplateData -> Hamlet HledgerWebAppRoute-filterform TD{here=here,a=a,p=p} = [$hamlet|- #filterformdiv-  %form#filterform.form!method=GET!style=display:$visible$;-   %table.form-    %tr.$filteringperiodclass$-     %td-      filter by period:-      \ $-     %td-      %input!name=p!size=60!value=$p$-      ^phelp^-      \ $-     %td!align=right-      ^stopfilteringperiod^-    %tr.$filteringclass$-     %td-      filter by account/description:-      \ $-     %td-      %input!name=a!size=60!value=$a$-      ^ahelp^-      \ $-      %input!type=submit!value=filter $-      \ $-     %td!align=right-      ^stopfiltering^-|]- where-  ahelp = helplink "filter-patterns" "?"-  phelp = helplink "period-expressions" "?"-  filtering = not $ null a-  filteringperiod = not $ null p-  visible = "block"-  filteringclass = if filtering then "filtering" else ""-  filteringperiodclass = if filteringperiod then "filtering" else ""-  stopfiltering = if filtering then [$hamlet|%a#stopfilterlink!href=@?u@ stop filtering acct/desc|] else nulltemplate-      where u = (here, if filteringperiod then [("p", p)] else [])-  stopfilteringperiod = if filteringperiod then [$hamlet|%a#stopfilterlink!href=@?u@ stop filtering period|] else nulltemplate-      where u = (here, if filtering then [("a", a)] else [])--helplink :: String -> String -> Hamlet HledgerWebAppRoute-helplink topic label = [$hamlet|%a!href=$u$!target=hledgerhelp $label$|]-    where u = manualurl ++ if null topic then "" else '#':topic--nulltemplate = [$hamlet||]-

@@ -0,0 +1,390 @@+{-|+Convert account data in CSV format (eg downloaded from a bank) to journal+format, and print it on stdout. See the manual for more details.+-}++module Hledger.Cli.Convert where+import Hledger.Cli.Options (Opt(Debug), progname_cli)+import Hledger.Cli.Version (progversionstr)+import Hledger.Data.Types (Journal,AccountName,Transaction(..),Posting(..),PostingType(..))+import Hledger.Data.Utils (strip, spacenonewline, restofline, parseWithCtx, assertParse, assertParseEqual, error')+import Hledger.Read.JournalReader (someamount,ledgeraccountname)+import Hledger.Data.Journal (nullctx)+import Hledger.Data.Amount (nullmixedamt)+import Safe (atDef, maximumDef)+import System.IO (stderr)+import Text.CSV (parseCSVFromFile, printCSV)+import Text.Printf (hPrintf)+import Text.RegexPR (matchRegexPR, gsubRegexPR)+import Data.Maybe+import Hledger.Data.Dates (firstJust, showDate, parsedate)+import System.Locale (defaultTimeLocale)+import Data.Time.Format (parseTime)+import Control.Monad (when, guard, liftM)+import Safe (readDef, readMay)+import System.Directory (doesFileExist)+import System.Exit (exitFailure)+import System.FilePath (takeBaseName, replaceExtension)+import Text.ParserCombinators.Parsec+import Test.HUnit+++{- |+A set of data definitions and account-matching patterns sufficient to+convert a particular CSV data file into meaningful journal transactions. See above.+-}+data CsvRules = CsvRules {+      dateField :: Maybe FieldPosition,+      statusField :: Maybe FieldPosition,+      codeField :: Maybe FieldPosition,+      descriptionField :: Maybe FieldPosition,+      amountField :: Maybe FieldPosition,+      currencyField :: Maybe FieldPosition,+      baseCurrency :: Maybe String,+      baseAccount :: AccountName,+      accountRules :: [AccountRule]+} deriving (Show, Eq)++nullrules = CsvRules {+      dateField=Nothing,+      statusField=Nothing,+      codeField=Nothing,+      descriptionField=Nothing,+      amountField=Nothing,+      currencyField=Nothing,+      baseCurrency=Nothing,+      baseAccount="unknown",+      accountRules=[]+}++type FieldPosition = Int++type AccountRule = (+   [(String, Maybe String)] -- list of regex match patterns with optional replacements+  ,AccountName              -- account name to use for a transaction matching this rule+  )++type CsvRecord = [String]+++-- | Read the CSV file named as an argument and print equivalent journal transactions,+-- using/creating a .rules file.+convert :: [Opt] -> [String] -> Journal -> IO ()+convert opts args _ = do+  when (null args) $ error' "please specify a csv data file."+  let csvfile = head args+  csvparse <- parseCSVFromFile csvfile+  let records = case csvparse of+                  Left e -> error' $ show e+                  Right rs -> reverse $ filter (/= [""]) rs+  let debug = Debug `elem` opts+      rulesfile = rulesFileFor csvfile+  exists <- doesFileExist rulesfile+  if (not exists) then do+                  hPrintf stderr "creating conversion rules file %s, edit this file for better results\n" rulesfile+                  writeFile rulesfile initialRulesFileContent+   else+      hPrintf stderr "using conversion rules file %s\n" rulesfile+  rules <- liftM (either (error'.show) id) $ parseCsvRulesFile rulesfile+  when debug $ hPrintf stderr "rules: %s\n" (show rules)+  let requiredfields = max 2 (maxFieldIndex rules + 1)+      badrecords = take 1 $ filter ((< requiredfields).length) records+  if null badrecords+   then mapM_ (printTxn debug rules) records+   else do+     hPrintf stderr (unlines [+                      "Warning, at least one CSV record does not contain a field referenced by the"+                     ,"conversion rules file, or has less than two fields. Are you converting a"+                     ,"valid CSV file ? First bad record:\n%s"+                     ]) (show $ head badrecords)+     exitFailure++-- | The highest (0-based) field index referenced in the field+-- definitions, or -1 if no fields are defined.+maxFieldIndex :: CsvRules -> Int+maxFieldIndex r = maximumDef (-1) $ catMaybes [+                   dateField r+                  ,statusField r+                  ,codeField r+                  ,descriptionField r+                  ,amountField r+                  ,currencyField r+                  ]++rulesFileFor :: FilePath -> FilePath+rulesFileFor csvfile = replaceExtension csvfile ".rules"++initialRulesFileContent :: String+initialRulesFileContent =+    "# csv conversion rules file generated by "++(progversionstr progname_cli)++"\n" +++    "# Add rules to this file for more accurate conversion, see\n"+++    "# http://hledger.org/MANUAL.html#convert\n" +++    "\n" +++    "base-account assets:bank:checking\n" +++    "date-field 0\n" +++    "description-field 4\n" +++    "amount-field 1\n" +++    "currency $\n" +++    "\n" +++    "# account-assigning rules\n" +++    "\n" +++    "SPECTRUM\n" +++    "expenses:health:gym\n" +++    "\n" +++    "ITUNES\n" +++    "BLKBSTR=BLOCKBUSTER\n" +++    "expenses:entertainment\n" +++    "\n" +++    "(TO|FROM) SAVINGS\n" +++    "assets:bank:savings\n"++-- rules file parser++parseCsvRulesFile :: FilePath -> IO (Either ParseError CsvRules)+parseCsvRulesFile f = do+  s <- readFile f+  return $ parseCsvRules f s++parseCsvRules :: FilePath -> String -> Either ParseError CsvRules+parseCsvRules rulesfile s = runParser csvrulesfile nullrules{baseAccount=takeBaseName rulesfile} rulesfile s++csvrulesfile :: GenParser Char CsvRules CsvRules+csvrulesfile = do+  many blankorcommentline+  many definitions+  r <- getState+  ars <- many accountrule+  many blankorcommentline+  eof+  return r{accountRules=ars}++-- | Real independent parser choice, even when alternative matches share a prefix.+choice' parsers = choice $ map try (init parsers) ++ [last parsers]++definitions :: GenParser Char CsvRules ()+definitions = do+  choice' [+    datefield+   ,statusfield+   ,codefield+   ,descriptionfield+   ,amountfield+   ,currencyfield+   ,basecurrency+   ,baseaccount+   ,commentline+   ] <?> "definition"+  return ()++datefield = do+  string "date-field"+  many1 spacenonewline+  v <- restofline+  r <- getState+  setState r{dateField=readMay v}++codefield = do+  string "code-field"+  many1 spacenonewline+  v <- restofline+  r <- getState+  setState r{codeField=readMay v}++statusfield = do+  string "status-field"+  many1 spacenonewline+  v <- restofline+  r <- getState+  setState r{statusField=readMay v}++descriptionfield = do+  string "description-field"+  many1 spacenonewline+  v <- restofline+  r <- getState+  setState r{descriptionField=readMay v}++amountfield = do+  string "amount-field"+  many1 spacenonewline+  v <- restofline+  r <- getState+  setState r{amountField=readMay v}++currencyfield = do+  string "currency-field"+  many1 spacenonewline+  v <- restofline+  r <- getState+  setState r{currencyField=readMay v}++basecurrency = do+  string "currency"+  many1 spacenonewline+  v <- restofline+  r <- getState+  setState r{baseCurrency=Just v}++baseaccount = do+  string "base-account"+  many1 spacenonewline+  v <- ledgeraccountname+  optional newline+  r <- getState+  setState r{baseAccount=v}++accountrule :: GenParser Char CsvRules AccountRule+accountrule = do+  many blankorcommentline+  pats <- many1 matchreplacepattern+  guard $ length pats >= 2+  let pats' = init pats+      acct = either (fail.show) id $ runParser ledgeraccountname () "" $ fst $ last pats+  many blankorcommentline+  return (pats',acct)+ <?> "account rule"++blanklines = many1 blankline >> return ()++blankline = many spacenonewline >> newline >> return () <?> "blank line"++commentchar = oneOf ";#"++commentline = many spacenonewline >> commentchar >> restofline >> return () <?> "comment line"++blankorcommentline = choice' [blankline, commentline]++matchreplacepattern = do+  notFollowedBy commentchar+  matchpat <- many1 (noneOf "=\n")+  replpat <- optionMaybe $ do {char '='; many $ noneOf "\n"}+  newline+  return (matchpat,replpat)++printTxn :: Bool -> CsvRules -> CsvRecord -> IO ()+printTxn debug rules rec = do+  when debug $ hPrintf stderr "record: %s" (printCSV [rec])+  putStr $ show $ transactionFromCsvRecord rules rec++-- csv record conversion++transactionFromCsvRecord :: CsvRules -> CsvRecord -> Transaction+transactionFromCsvRecord rules fields =+  let +      date = parsedate $ normaliseDate $ maybe "1900/1/1" (atDef "" fields) (dateField rules)+      status = maybe False (null . strip . (atDef "" fields)) (statusField rules)+      code = maybe "" (atDef "" fields) (codeField rules)+      desc = maybe "" (atDef "" fields) (descriptionField rules)+      comment = ""+      precomment = ""+      amountstr = maybe "" (atDef "" fields) (amountField rules)+      amountstr' = strnegate amountstr where strnegate ('-':s) = s+                                             strnegate s = '-':s+      currency = maybe (fromMaybe "" $ baseCurrency rules) (atDef "" fields) (currencyField rules)+      amountstr'' = currency ++ amountstr'+      amountparse = runParser someamount nullctx "" amountstr''+      amount = either (const nullmixedamt) id amountparse+      unknownacct | (readDef 0 amountstr' :: Double) < 0 = "income:unknown"+                  | otherwise = "expenses:unknown"+      (acct,newdesc) = identify (accountRules rules) unknownacct desc+      t = Transaction {+              tdate=date,+              teffectivedate=Nothing,+              tstatus=status,+              tcode=code,+              tdescription=newdesc,+              tcomment=comment,+              tpreceding_comment_lines=precomment,+              tmetadata=[],+              tpostings=[+                   Posting {+                     pstatus=False,+                     paccount=acct,+                     pamount=amount,+                     pcomment="",+                     ptype=RegularPosting,+                     pmetadata=[],+                     ptransaction=Just t+                   },+                   Posting {+                     pstatus=False,+                     paccount=baseAccount rules,+                     pamount=(-amount),+                     pcomment="",+                     ptype=RegularPosting,+                     pmetadata=[],+                     ptransaction=Just t+                   }+                  ]+            }+  in t++-- | Convert some date string with unknown format to YYYY/MM/DD.+normaliseDate :: String -> String+normaliseDate s = maybe "0000/00/00" showDate $+              firstJust+              [parseTime defaultTimeLocale "%Y/%m/%e" s+               -- can't parse a month without leading 0, try adding one+              ,parseTime defaultTimeLocale "%Y/%m/%e" (take 5 s ++ "0" ++ drop 5 s)+              ,parseTime defaultTimeLocale "%Y-%m-%e" s+              ,parseTime defaultTimeLocale "%Y-%m-%e" (take 5 s ++ "0" ++ drop 5 s)+              ,parseTime defaultTimeLocale "%m/%e/%Y" s+              ,parseTime defaultTimeLocale "%m/%e/%Y" ('0':s)+              ,parseTime defaultTimeLocale "%m-%e-%Y" s+              ,parseTime defaultTimeLocale "%m-%e-%Y" ('0':s)+              ]++-- | Apply account matching rules to a transaction description to obtain+-- the most appropriate account and a new description.+identify :: [AccountRule] -> String -> String -> (String,String)+identify rules defacct desc | null matchingrules = (defacct,desc)+                            | otherwise = (acct,newdesc)+    where+      matchingrules = filter ismatch rules :: [AccountRule]+          where ismatch = any (isJust . flip matchRegexPR (caseinsensitive desc) . fst) . fst+      (prs,acct) = head matchingrules+      p_ms_r = filter (\(_,m,_) -> isJust m) $ map (\(p,r) -> (p, matchRegexPR (caseinsensitive p) desc, r)) prs+      (p,_,r) = head p_ms_r+      newdesc = case r of Just rpat -> gsubRegexPR (caseinsensitive p) rpat desc+                          Nothing   -> desc++caseinsensitive = ("(?i)"++)++tests_Convert = TestList [++   "convert rules parsing: empty file" ~: do+     -- let assertMixedAmountParse parseresult mixedamount =+     --         (either (const "parse error") showMixedAmountDebug parseresult) ~?= (showMixedAmountDebug mixedamount)+    assertParseEqual (parseCsvRules "unknown" "") nullrules++  ,"convert rules parsing: accountrule" ~: do+     assertParseEqual (parseWithCtx nullrules accountrule "A\na\n") -- leading blank line required+                 ([("A",Nothing)], "a")++  ,"convert rules parsing: trailing comments" ~: do+     assertParse (parseWithCtx nullrules csvrulesfile "A\na\n# \n#\n")++  ,"convert rules parsing: trailing blank lines" ~: do+     assertParse (parseWithCtx nullrules csvrulesfile "A\na\n\n  \n")++  -- not supported+  -- ,"convert rules parsing: no final newline" ~: do+  --    assertParse (parseWithCtx nullrules csvrulesfile "A\na")+  --    assertParse (parseWithCtx nullrules csvrulesfile "A\na\n# \n#")+  --    assertParse (parseWithCtx nullrules csvrulesfile "A\na\n\n  ")++                 -- (nullrules{+                 --   -- dateField=Maybe FieldPosition,+                 --   -- statusField=Maybe FieldPosition,+                 --   -- codeField=Maybe FieldPosition,+                 --   -- descriptionField=Maybe FieldPosition,+                 --   -- amountField=Maybe FieldPosition,+                 --   -- currencyField=Maybe FieldPosition,+                 --   -- baseCurrency=Maybe String,+                 --   -- baseAccount=AccountName,+                 --   accountRules=[+                 --        ([("A",Nothing)], "a")+                 --       ]+                 --  })++  ]

@@ -0,0 +1,50 @@+{-# LANGUAGE CPP #-}+{-| ++Print a histogram report.++-}++module Hledger.Cli.Histogram+where+import Hledger.Data+import Hledger.Cli.Options+#if __GLASGOW_HASKELL__ <= 610+import Prelude hiding ( putStr )+import System.IO.UTF8+#endif+++barchar = '*'++-- | Print a histogram of some statistic per reporting interval, such as+-- number of postings per day.+histogram :: [Opt] -> [String] -> Journal -> IO ()+histogram opts args j = do+  t <- getCurrentLocalTime+  putStr $ showHistogram opts (optsToFilterSpec opts args t) j++showHistogram :: [Opt] -> FilterSpec -> Journal -> String+showHistogram opts filterspec j = concatMap (printDayWith countBar) dayps+    where+      i = intervalFromOpts opts+      interval | i == NoInterval = Daily+               | otherwise = i+      fullspan = journalDateSpan j+      days = filter (DateSpan Nothing Nothing /=) $ splitSpan interval fullspan+      dayps = [(s, filter (isPostingInDateSpan s) ps) | s <- days]+      -- same as Register+      -- should count transactions, not postings ?+      ps = sortBy (comparing postingDate) $ filterempties $ filter matchapats $ filterdepth $ journalPostings j+      filterempties+          | Empty `elem` opts = id+          | otherwise = filter (not . isZeroMixedAmount . pamount)+      matchapats = matchpats apats . paccount+      apats = acctpats filterspec+      filterdepth | interval == NoInterval = filter (\p -> accountNameLevel (paccount p) <= depth)+                  | otherwise = id+      depth = fromMaybe 99999 $ depthFromOpts opts++printDayWith f (DateSpan b _, ts) = printf "%s %s\n" (show $ fromJust b) (f ts)++countBar ps = replicate (length ps) barchar

@@ -39,33 +39,30 @@ -}  module Hledger.Cli.Main where-#if defined(WEB)-import System.Info (os)-#endif+ #if __GLASGOW_HASKELL__ <= 610 import Prelude hiding (putStr, putStrLn) import System.IO.UTF8 #endif -import Hledger.Cli.Commands.All import Hledger.Data+import Hledger.Cli.Commands import Hledger.Cli.Options import Hledger.Cli.Tests import Hledger.Cli.Utils (withJournalDo)-import Hledger.Cli.Version (versionmsg, binaryfilename)+import Hledger.Cli.Version (progversionstr, binaryfilename)  main :: IO () main = do-  (opts, cmd, args) <- parseArguments-  run cmd opts args+  (opts, args) <- parseArgumentsWith options_cli+  run opts args     where-      run cmd opts args-       | Help `elem` opts             = putStr help1-       | HelpOptions `elem` opts      = putStr help2-       | HelpAll `elem` opts          = putStr $ help1 ++ "\n" ++ help2-       | Version `elem` opts          = putStrLn versionmsg-       | BinaryFilename `elem` opts   = putStrLn binaryfilename-       | null cmd                     = maybe (putStr help1) (withJournalDo opts args cmd) defaultcmd+      run opts _+       | Help `elem` opts             = putStr usage_cli+       | Version `elem` opts          = putStrLn $ progversionstr progname_cli+       | BinaryFilename `elem` opts   = putStrLn $ binaryfilename progname_cli+      run _ []                        = argsError "a command is required."+      run opts (cmd:args)        | cmd `isPrefixOf` "balance"   = withJournalDo opts args cmd balance        | cmd `isPrefixOf` "convert"   = withJournalDo opts args cmd convert        | cmd `isPrefixOf` "print"     = withJournalDo opts args cmd print'@@ -73,22 +70,5 @@        | cmd `isPrefixOf` "histogram" = withJournalDo opts args cmd histogram        | cmd `isPrefixOf` "add"       = withJournalDo opts args cmd add        | cmd `isPrefixOf` "stats"     = withJournalDo opts args cmd stats-#ifdef VTY-       | cmd `isPrefixOf` "vty"       = withJournalDo opts args cmd vty-#endif-#if defined(WEB)-       | cmd `isPrefixOf` "web"       = withJournalDo opts args cmd web-#endif-#ifdef CHART-       | cmd `isPrefixOf` "chart"       = withJournalDo opts args cmd chart-#endif        | cmd `isPrefixOf` "test"      = runtests opts args >> return ()-       | otherwise                    = putStr help1---- in a web-enabled build on windows, run the web ui by default-#if defined(WEB)-      defaultcmd | os=="mingw32" = Just web-                 | otherwise = Nothing-#else-      defaultcmd = Nothing-#endif+       | otherwise                    = argsError $ "command "++cmd++" is unrecognized."

@@ -5,70 +5,58 @@  module Hledger.Cli.Options where+import Codec.Binary.UTF8.String (decodeString) import System.Console.GetOpt import System.Environment-import Hledger.Cli.Version (timeprogname)-import Hledger.Read (myJournalPath, myTimelogPath)+ import Hledger.Data.Utils import Hledger.Data.Types import Hledger.Data.Dates-import Codec.Binary.UTF8.String (decodeString)+import Hledger.Read (myJournalPath, myTimelogPath) -#ifdef CHART-chartoutput   = "hledger.png"-chartitems    = 10-chartsize     = "600x400"-#endif -help1 =+progname_cli = "hledger"++-- | The program name which, if we are invoked as (via symlink or+-- renaming), causes us to default to reading the user's time log instead+-- of their journal.+progname_cli_time  = "hours"++usage_preamble_cli =   "Usage: hledger [OPTIONS] COMMAND [PATTERNS]\n" ++   "       hledger [OPTIONS] convert CSVFILE\n" ++-  "       hledger [OPTIONS] stats\n" ++   "\n" ++-  "hledger reads your ~/.journal file, or another specified with $LEDGER or -f\n" +++  "Reads your ~/.journal file, or another specified by $LEDGER or -f, and\n" +++  "runs the specified command (may be abbreviated):\n" ++   "\n" ++-  "COMMAND is one of (may be abbreviated):\n" ++   "  add       - prompt for new transactions and add them to the journal\n" ++   "  balance   - show accounts, with balances\n" ++-  "  convert   - read CSV bank data and display in journal format\n" +++  "  convert   - show the specified CSV file as a hledger journal\n" ++   "  histogram - show a barchart of transactions per day or other interval\n" ++   "  print     - show transactions in journal format\n" ++   "  register  - show transactions as a register with running balance\n" ++   "  stats     - show various statistics for a journal\n" ++-  "  vty       - run a simple curses-style UI" ++-#ifdef VTY-  "\n" ++-#else-  " (DISABLED, install with -fvty)\n" ++-#endif-  "  web       - run a simple web-based UI" ++-#if defined(WEB)-  "\n" ++-#else-  " (DISABLED, install with -fweb)\n" ++-#endif-  "  chart     - generate balances pie charts" ++-#ifdef CHART-  "\n" ++-#else-  " (DISABLED, install with -fchart)\n" ++-#endif   "  test      - run self-tests\n" ++-  "\n" ++-  "PATTERNS are regular expressions which filter by account name.\n" ++-  "Prefix with desc: to filter by transaction description instead.\n" ++-  "Prefix with not: to negate a pattern. When using both, not: comes last.\n" ++-  "\n" ++-  "DATES can be y/m/d or ledger-style smart dates like \"last month\".\n" ++-  "\n" ++-  "Use --help-options to see OPTIONS, or --help-all/-H.\n" ++-  ""+  "\n" -help2 = usageInfo "Options:\n" options+usage_options_cli = usageInfo "hledger options:" options_cli +usage_postscript_cli =+ "\n" +++ "DATES can be y/m/d or smart dates like \"last month\".  PATTERNS are regular\n" +++ "expressions which filter by account name.  Prefix a pattern with desc: to\n" +++ "filter by transaction description instead, prefix with not: to negate it.\n" +++ "When using both, not: comes last.\n"++usage_cli = concat [+             usage_preamble_cli+            ,usage_options_cli+            ,usage_postscript_cli+            ]+ -- | Command-line options we accept.-options :: [OptDescr Opt]-options = [+options_cli :: [OptDescr Opt]+options_cli = [   Option "f" ["file"]         (ReqArg File "FILE")   "use a different journal/timelog file; - means stdin"  ,Option ""  ["no-new-accounts"] (NoArg NoNewAccts)  "don't allow to create new accounts"  ,Option "b" ["begin"]        (ReqArg Begin "DATE")  "report on transactions on or after this date"@@ -92,66 +80,52 @@  ,Option "M" ["monthly"]      (NoArg  MonthlyOpt)    "register, stats: report by month"  ,Option "Q" ["quarterly"]    (NoArg  QuarterlyOpt)  "register, stats: report by quarter"  ,Option "Y" ["yearly"]       (NoArg  YearlyOpt)     "register, stats: report by year"-#ifdef CHART- ,Option "o" ["output"]  (ReqArg ChartOutput "FILE")    ("chart: output filename (default: "++chartoutput++")")- ,Option ""  ["items"]  (ReqArg ChartItems "N")         ("chart: number of accounts to show (default: "++show chartitems++")")- ,Option ""  ["size"] (ReqArg ChartSize "WIDTHxHEIGHT") ("chart: image size (default: "++chartsize++")")-#endif-#ifdef VTY- ,Option ""  ["debug-vty"]    (NoArg  DebugVty)      "vty: run with no terminal output, showing console"-#endif-#ifdef WEB- ,Option ""  ["base-url"]     (ReqArg BaseUrl "URL") "web: use this base url (default http://localhost:PORT)"- ,Option ""  ["port"]         (ReqArg Port "N")      "web: serve on tcp port N (default 5000)"-#endif  ,Option "v" ["verbose"]      (NoArg  Verbose)       "show more verbose output"  ,Option ""  ["debug"]        (NoArg  Debug)         "show extra debug output; implies verbose"  ,Option ""  ["binary-filename"] (NoArg BinaryFilename) "show the download filename for this hledger build"  ,Option "V" ["version"]      (NoArg  Version)       "show version information"- ,Option "h" ["help"]         (NoArg  Help)          "show basic command-line usage"- ,Option ""  ["help-options"] (NoArg  HelpOptions)   "show command-line options"- ,Option "H" ["help-all"]     (NoArg  HelpAll)       "show command-line usage and options"+ ,Option "h" ["help"]         (NoArg  Help)          "show command-line usage"  ]  -- | An option value from a command-line flag. data Opt = -    File    {value::String} | -    NoNewAccts |-    Begin   {value::String} | -    End     {value::String} | -    Period  {value::String} | -    Cleared | -    UnCleared | -    CostBasis | -    Depth   {value::String} | -    Display {value::String} | -    Effective | -    Empty | -    Real | -    Flat |-    Drop   {value::String} |-    NoTotal |-    SubTotal |-    DailyOpt |-    WeeklyOpt |-    MonthlyOpt |-    QuarterlyOpt |-    YearlyOpt |-    BaseUrl {value::String} |-    Port    {value::String} |-    Help |-    HelpOptions |-    HelpAll |-    Verbose |-    Version+    File          {value::String}+    | NoNewAccts+    | Begin       {value::String}+    | End         {value::String}+    | Period      {value::String}+    | Cleared+    | UnCleared+    | CostBasis+    | Depth       {value::String}+    | Display     {value::String}+    | Effective+    | Empty+    | Real+    | Flat+    | Drop        {value::String}+    | NoTotal+    | SubTotal+    | DailyOpt+    | WeeklyOpt+    | MonthlyOpt+    | QuarterlyOpt+    | YearlyOpt+    | Help+    | Verbose+    | Version     | BinaryFilename     | Debug+    -- XXX add-on options, must be defined here for now+    -- vty     | DebugVty-#ifdef CHART+    -- web+    | BaseUrl     {value::String}+    | Port        {value::String}+    -- chart     | ChartOutput {value::String}     | ChartItems  {value::String}     | ChartSize   {value::String}-#endif     deriving (Show,Eq)  -- these make me nervous@@ -167,20 +141,24 @@ optValuesForConstructors fs opts = concatMap get opts     where get o = [v | any (\f -> f v == o) fs] where v = value o --- | Parse the command-line arguments into options, command name, and--- command arguments. Any dates in the options are converted to explicit--- YYYY/MM/DD format based on the current time.-parseArguments :: IO ([Opt], String, [String])-parseArguments = do-  args <- liftM (map decodeString) getArgs-  let (os,as,es) = getOpt Permute options args-  os' <- fixOptDates os-  let os'' = if Debug `elem` os' then Verbose:os' else os'-  case (as,es) of-    (cmd:args,[])   -> return (os'',cmd,args)-    ([],[])         -> return (os'',"",[])-    (_,errs)        -> ioError (userError' (concat errs ++ help1))+-- | Parse the command-line arguments into options and arguments using the+-- specified option descriptors. Any smart dates in the options are+-- converted to explicit YYYY/MM/DD format based on the current time. If+-- parsing fails, raise an error, displaying the problem along with the+-- provided usage string.+parseArgumentsWith :: [OptDescr Opt] -> IO ([Opt], [String])+parseArgumentsWith options = do+  rawargs <- map decodeString `fmap` getArgs+  let (opts,args,errs) = getOpt Permute options rawargs+  opts' <- fixOptDates opts+  let opts'' = if Debug `elem` opts' then Verbose:opts' else opts'+  if null errs+   then return (opts'',args)+   else argsError (concat errs) >> return ([],[]) +argsError :: String -> IO ()+argsError = ioError . userError' . (++ " Run with --help to see usage.")+ -- | Convert any fuzzy dates within these option values to explicit ones, -- based on today's date. fixOptDates :: [Opt] -> IO [Opt]@@ -277,7 +255,7 @@ usingTimeProgramName :: IO Bool usingTimeProgramName = do   progname <- getProgName-  return $ map toLower progname == timeprogname+  return $ map toLower progname == progname_cli_time  -- | Get the journal file path from options, an environment variable, or a default journalFilePathFromOpts :: [Opt] -> IO String@@ -317,4 +295,3 @@ --     where --       listtomaybe [] = Nothing --       listtomaybe vs = Just $ last vs-

@@ -0,0 +1,43 @@+{-# LANGUAGE CPP #-}+{-| ++A ledger-compatible @print@ command.++-}++module Hledger.Cli.Print (+  JournalReport+ ,JournalReportItem+ ,print'+ ,journalReport+ ,showTransactions+) where+import Hledger.Data+import Hledger.Cli.Options+#if __GLASGOW_HASKELL__ <= 610+import Prelude hiding ( putStr )+import System.IO.UTF8+#endif+++-- | A "journal report" is just a list of transactions.+type JournalReport = [JournalReportItem]++-- | The data for a single journal report item, representing one transaction.+type JournalReportItem = Transaction++-- | Print journal transactions in standard format.+print' :: [Opt] -> [String] -> Journal -> IO ()+print' opts args j = do+  t <- getCurrentLocalTime+  putStr $ showTransactions (optsToFilterSpec opts args t) j++showTransactions :: FilterSpec -> Journal -> String+showTransactions fspec j = journalReportAsText [] fspec $ journalReport [] fspec j++journalReportAsText :: [Opt] -> FilterSpec -> JournalReport -> String -- XXX unlike the others, this one needs fspec not opts+journalReportAsText _ fspec items = concatMap (showTransactionForPrint effective) items+    where effective = EffectiveDate == whichdate fspec++journalReport :: [Opt] -> FilterSpec -> Journal -> JournalReport+journalReport _ fspec j = sortBy (comparing tdate) $ jtxns $ filterJournalTransactions fspec j

@@ -0,0 +1,207 @@+{-# LANGUAGE CPP #-}+{-| ++A ledger-compatible @register@ command.++-}++module Hledger.Cli.Register (+  RegisterReport+ ,RegisterReportItem+ ,register+ ,registerReport+ ,registerReportAsText+ ,showPostingWithBalanceForVty+ ,tests_Register+) where++import Safe (headMay, lastMay)+import Hledger.Data+import Hledger.Cli.Options+#if __GLASGOW_HASKELL__ <= 610+import Prelude hiding ( putStr )+import System.IO.UTF8+#endif+import Text.ParserCombinators.Parsec+++-- | A register report is a list of postings to an account or set of+-- accounts, with a running total. Postings may be actual postings, or+-- virtual postings aggregated over a reporting interval.+type RegisterReport = [RegisterReportItem] -- line items, one per posting++-- | The data for a single register report line item, representing one posting.+type RegisterReportItem = (Maybe (Day, String) -- transaction date and description if this is the first posting+                          ,Posting             -- the posting+                          ,MixedAmount         -- balance so far+                          )++-- | Print a register report.+register :: [Opt] -> [String] -> Journal -> IO ()+register opts args j = do+  t <- getCurrentLocalTime+  putStr $ registerReportAsText opts $ registerReport opts (optsToFilterSpec opts args t) j++-- | Render a register report as plain text suitable for console output.+registerReportAsText :: [Opt] -> RegisterReport -> String+registerReportAsText opts = unlines . map (registerReportItemAsText opts)++-- | Render one register report line item as plain text. Eg:+-- @+-- date (10)  description (20)     account (22)            amount (11)  balance (12)+-- DDDDDDDDDD dddddddddddddddddddd aaaaaaaaaaaaaaaaaaaaaa  AAAAAAAAAAA AAAAAAAAAAAA+-- ^ displayed for first postings^+--   only, otherwise blank+-- @+registerReportItemAsText :: [Opt] -> RegisterReportItem -> String+registerReportItemAsText _ (dd, p, b) = concatTopPadded [datedesc, pstr, " ", bal]+    where+      datedesc = case dd of Nothing -> replicate datedescwidth ' '+                            Just (da, de) -> printf "%s %s " date desc+                                where+                                  date = showDate da+                                  desc = printf ("%-"++(show descwidth)++"s") $ elideRight descwidth de :: String+          where+            descwidth = datedescwidth - datewidth - 2+            datedescwidth = 32+            datewidth = 10+      pstr = showPostingForRegister p+      bal = padleft 12 (showMixedAmountOrZeroWithoutPrice b)++showPostingWithBalanceForVty showtxninfo p b = registerReportItemAsText [] $ mkitem showtxninfo p b++-- | Get a register report with the specified options for this journal.+registerReport :: [Opt] -> FilterSpec -> Journal -> RegisterReport+registerReport opts fspec j = getitems ps nullposting startbal+    where+      ps | interval == NoInterval = displayableps+         | otherwise              = summarisePostingsByInterval interval depth empty filterspan displayableps+      (precedingps, displayableps, _) = postingsMatchingDisplayExpr (displayExprFromOpts opts)+                                        $ depthClipPostings depth+                                        $ journalPostings+                                        $ filterJournalPostings fspec{depth=Nothing} j+      startbal = sumPostings precedingps+      filterspan = datespan fspec+      (interval, depth, empty) = (intervalFromOpts opts, depthFromOpts opts, Empty `elem` opts)++-- | Generate register report line items.+getitems :: [Posting] -> Posting -> MixedAmount -> [RegisterReportItem]+getitems [] _ _ = []+getitems (p:ps) pprev b = i:(getitems ps p b')+    where+      i = mkitem isfirst p b'+      isfirst = ptransaction p /= ptransaction pprev+      b' = b + pamount p++-- | Generate one register report line item, from a flag indicating+-- whether to include transaction info, a posting, and the current running+-- balance.+mkitem :: Bool -> Posting -> MixedAmount -> RegisterReportItem+mkitem False p b = (Nothing, p, b)+mkitem True p b = (ds, p, b)+    where ds = case ptransaction p of Just (Transaction{tdate=da,tdescription=de}) -> Just (da,de)+                                      Nothing -> Just (nulldate,"")++-- | Date-sort and split a list of postings into three spans - postings matched+-- by the given display expression, and the preceding and following postings.+postingsMatchingDisplayExpr :: Maybe String -> [Posting] -> ([Posting],[Posting],[Posting])+postingsMatchingDisplayExpr d ps = (before, matched, after)+    where +      sorted = sortBy (comparing postingDate) ps+      (before, rest) = break (displayExprMatches d) sorted+      (matched, after) = span (displayExprMatches d) rest++-- | Does this display expression allow this posting to be displayed ?+-- Raises an error if the display expression can't be parsed.+displayExprMatches :: Maybe String -> Posting -> Bool+displayExprMatches Nothing  _ = True+displayExprMatches (Just d) p = (fromparse $ parsewith datedisplayexpr d) p+                        +-- | Parse a hledger display expression, which is a simple date test like+-- "d>[DATE]" or "d<=[DATE]", and return a "Posting"-matching predicate.+datedisplayexpr :: GenParser Char st (Posting -> Bool)+datedisplayexpr = do+  char 'd'+  op <- compareop+  char '['+  (y,m,d) <- smartdate+  char ']'+  let date    = parsedate $ printf "%04s/%02s/%02s" y m d+      test op = return $ (`op` date) . postingDate+  case op of+    "<"  -> test (<)+    "<=" -> test (<=)+    "="  -> test (==)+    "==" -> test (==)+    ">=" -> test (>=)+    ">"  -> test (>)+    _    -> mzero+ where+  compareop = choice $ map (try . string) ["<=",">=","==","<","=",">"]++-- XXX confusing, refactor++-- | Convert a list of postings into summary postings. Summary postings+-- are one per account per interval and aggregated to the specified depth+-- if any.+summarisePostingsByInterval :: Interval -> Maybe Int -> Bool -> DateSpan -> [Posting] -> [Posting]+summarisePostingsByInterval interval depth empty filterspan ps = concatMap summarisespan $ splitSpan interval reportspan+    where+      summarisespan s = summarisePostingsInDateSpan s depth empty (postingsinspan s)+      postingsinspan s = filter (isPostingInDateSpan s) ps+      dataspan = postingsDateSpan ps+      reportspan | empty = filterspan `orDatesFrom` dataspan+                 | otherwise = dataspan++-- | Given a date span (representing a reporting interval) and a list of+-- postings within it: aggregate the postings so there is only one per+-- account, and adjust their date/description so that they will render+-- as a summary for this interval.+-- +-- As usual with date spans the end date is exclusive, but for display+-- purposes we show the previous day as end date, like ledger.+-- +-- When a depth argument is present, postings to accounts of greater+-- depth are aggregated where possible.+-- +-- The showempty flag includes spans with no postings and also postings+-- with 0 amount.+summarisePostingsInDateSpan :: DateSpan -> Maybe Int -> Bool -> [Posting] -> [Posting]+summarisePostingsInDateSpan (DateSpan b e) depth showempty ps+    | null ps && (isNothing b || isNothing e) = []+    | null ps && showempty = [summaryp]+    | otherwise = summaryps'+    where+      summaryp = summaryPosting b' ("- "++ showDate (addDays (-1) e'))+      b' = fromMaybe (maybe nulldate postingDate $ headMay ps) b+      e' = fromMaybe (maybe (addDays 1 nulldate) postingDate $ lastMay ps) e+      summaryPosting date desc = nullposting{ptransaction=Just nulltransaction{tdate=date,tdescription=desc}}++      summaryps' = (if showempty then id else filter (not . isZeroMixedAmount . pamount)) summaryps+      summaryps = [summaryp{paccount=a,pamount=balancetoshowfor a} | a <- clippedanames]+      anames = sort $ nub $ map paccount ps+      -- aggregate balances by account, like journalToLedger, then do depth-clipping+      (_,_,exclbalof,inclbalof) = groupPostings ps+      clippedanames = nub $ map (clipAccountName d) anames+      isclipped a = accountNameLevel a >= d+      d = fromMaybe 99999 $ depth+      balancetoshowfor a =+          (if isclipped a then inclbalof else exclbalof) (if null a then "top" else a)++-- | Clip the account names to the specified depth in a list of postings.+depthClipPostings :: Maybe Int -> [Posting] -> [Posting]+depthClipPostings depth = map (depthClipPosting depth)++-- | Clip a posting's account name to the specified depth.+depthClipPosting :: Maybe Int -> Posting -> Posting+depthClipPosting Nothing p = p+depthClipPosting (Just d) p@Posting{paccount=a} = p{paccount=clipAccountName d a}+++tests_Register :: Test+tests_Register = TestList [++         "summarisePostingsByInterval" ~: do+           summarisePostingsByInterval Quarterly Nothing False (DateSpan Nothing Nothing) [] ~?= []++        ]

@@ -0,0 +1,84 @@+{-# LANGUAGE CPP #-}+{-|++Print some statistics for the journal.++-}++module Hledger.Cli.Stats+where+import Hledger.Data+import Hledger.Cli.Options+import qualified Data.Map as Map+#if __GLASGOW_HASKELL__ <= 610+import Prelude hiding ( putStr )+import System.IO.UTF8+#endif+++-- like Register.summarisePostings+-- | Print various statistics for the journal.+stats :: [Opt] -> [String] -> Journal -> IO ()+stats opts args j = do+  today <- getCurrentDay+  t <- getCurrentLocalTime+  let filterspec = optsToFilterSpec opts args t+      l = journalToLedger filterspec j+      reportspan = (ledgerDateSpan l) `orDatesFrom` (datespan filterspec)+      intervalspans = splitSpan (intervalFromOpts opts) reportspan+      showstats = showLedgerStats opts args l today+      s = intercalate "\n" $ map showstats intervalspans+  putStr s++showLedgerStats :: [Opt] -> [String] -> Ledger -> Day -> DateSpan -> String+showLedgerStats _ _ l today span =+    unlines (map (uncurry (printf fmt)) stats)+    where+      fmt = "%-" ++ show w1 ++ "s: %-" ++ show w2 ++ "s"+      w1 = maximum $ map (length . fst) stats+      w2 = maximum $ map (length . show . snd) stats+      stats = [+         ("Journal file", journalFilePath $ journal l)+        ,("Transactions span", printf "%s to %s (%d days)" (start span) (end span) days)+        ,("Last transaction", maybe "none" show lastdate ++ showelapsed lastelapsed)+        ,("Transactions", printf "%d (%0.1f per day)" tnum txnrate)+        ,("Transactions last 30 days", printf "%d (%0.1f per day)" tnum30 txnrate30)+        ,("Transactions last 7 days", printf "%d (%0.1f per day)" tnum7 txnrate7)+        ,("Payees/descriptions", show $ length $ nub $ map tdescription ts)+        ,("Accounts", printf "%d (depth %d)" acctnum acctdepth)+        ,("Commodities", printf "%s (%s)" (show $ length cs) (intercalate ", " cs))+      -- Transactions this month     : %(monthtxns)s (last month in the same period: %(lastmonthtxns)s)+      -- Uncleared transactions      : %(uncleared)s+      -- Days since reconciliation   : %(reconcileelapsed)s+      -- Days since last transaction : %(recentelapsed)s+       ]+           where+             ts = sortBy (comparing tdate) $ filter (spanContainsDate span . tdate) $ jtxns $ journal l+             as = nub $ map paccount $ concatMap tpostings ts+             cs = Map.keys $ canonicaliseCommodities $ nub $ map commodity $ concatMap amounts $ map pamount $ concatMap tpostings ts+             lastdate | null ts = Nothing+                      | otherwise = Just $ tdate $ last ts+             lastelapsed = maybe Nothing (Just . diffDays today) lastdate+             showelapsed Nothing = ""+             showelapsed (Just days) = printf " (%d %s)" days' direction+                                       where days' = abs days+                                             direction | days >= 0 = "days ago"+                                                       | otherwise = "days from now"+             tnum = length ts+             start (DateSpan (Just d) _) = show d+             start _ = ""+             end (DateSpan _ (Just d)) = show d+             end _ = ""+             days = fromMaybe 0 $ daysInSpan span+             txnrate | days==0 = 0+                     | otherwise = fromIntegral tnum / fromIntegral days :: Double+             tnum30 = length $ filter withinlast30 ts+             withinlast30 t = d >= addDays (-30) today && (d<=today) where d = tdate t+             txnrate30 = fromIntegral tnum30 / 30 :: Double+             tnum7 = length $ filter withinlast7 ts+             withinlast7 t = d >= addDays (-7) today && (d<=today) where d = tdate t+             txnrate7 = fromIntegral tnum7 / 7 :: Double+             acctnum = length as+             acctdepth | null as = 0+                       | otherwise = maximum $ map accountNameLevel as+

@@ -12,10 +12,10 @@  hledger's doctests are shell tests defined in literal blocks in haddock documentation in the source, run by doing @make doctest@ in the hledger-source tree. They hardly used, but here is an example:+source tree. are They hardly used, but here is an example:  @-$ hledger -f data/sample.journal balance o+$ bin/hledger -f data/sample.journal balance o                   $1  expenses:food                  $-2  income                  $-1    gifts@@ -32,11 +32,10 @@ import System.Exit (exitFailure, exitWith, ExitCode(ExitSuccess)) -- base 3 compatible import System.Time (ClockTime(TOD)) -import Hledger.Cli.Commands.All import Hledger.Data  -- including testing utils in Hledger.Data.Utils-import Hledger.Read.Common (emptyCtx) import Hledger.Read (readJournal)-import Hledger.Read.Journal (someamount)+import Hledger.Read.JournalReader (someamount)+import Hledger.Cli.Commands import Hledger.Cli.Options import Hledger.Cli.Utils @@ -63,7 +62,7 @@    "account directive" ~:    let sameParse str1 str2 = do j1 <- readJournal Nothing str1 >>= either error' return                                 j2 <- readJournal Nothing str2 >>= either error' return-                                j1 `is` j2{filereadtime=filereadtime j1, jtext=jtext j1}+                                j1 `is` j2{filereadtime=filereadtime j1, files=files j1, jContext=jContext j1}    in TestList    [     "account directive 1" ~: sameParse @@ -272,20 +271,20 @@    ,"balanceTransaction" ~: do      assertBool "detect unbalanced entry, sign error"-                    (isLeft $ balanceTransaction-                           (Transaction (parsedate "2007/01/28") Nothing False "" "test" ""-                            [Posting False "a" (Mixed [dollars 1]) "" RegularPosting Nothing, -                             Posting False "b" (Mixed [dollars 1]) "" RegularPosting Nothing+                    (isLeft $ balanceTransaction Nothing+                           (Transaction (parsedate "2007/01/28") Nothing False "" "test" "" []+                            [Posting False "a" (Mixed [dollars 1]) "" RegularPosting [] Nothing, +                             Posting False "b" (Mixed [dollars 1]) "" RegularPosting [] Nothing                             ] ""))      assertBool "detect unbalanced entry, multiple missing amounts"-                    (isLeft $ balanceTransaction-                           (Transaction (parsedate "2007/01/28") Nothing False "" "test" ""-                            [Posting False "a" missingamt "" RegularPosting Nothing, -                             Posting False "b" missingamt "" RegularPosting Nothing+                    (isLeft $ balanceTransaction Nothing+                           (Transaction (parsedate "2007/01/28") Nothing False "" "test" "" []+                            [Posting False "a" missingamt "" RegularPosting [] Nothing, +                             Posting False "b" missingamt "" RegularPosting [] Nothing                             ] ""))-     let e = balanceTransaction (Transaction (parsedate "2007/01/28") Nothing False "" "test" ""-                           [Posting False "a" (Mixed [dollars 1]) "" RegularPosting Nothing, -                            Posting False "b" missingamt "" RegularPosting Nothing+     let e = balanceTransaction Nothing (Transaction (parsedate "2007/01/28") Nothing False "" "test" "" []+                           [Posting False "a" (Mixed [dollars 1]) "" RegularPosting [] Nothing, +                            Posting False "b" missingamt "" RegularPosting [] Nothing                            ] "")      assertBool "one missing amount should be ok" (isRight e)      assertEqual "balancing amount is added" @@ -340,43 +339,43 @@     "my assets" `isAccountNamePrefixOf` "assets:bank" `is` False    ,"isTransactionBalanced" ~: do-     let t = Transaction (parsedate "2009/01/01") Nothing False "" "a" ""-             [Posting False "b" (Mixed [dollars 1.00]) "" RegularPosting (Just t)-             ,Posting False "c" (Mixed [dollars (-1.00)]) "" RegularPosting (Just t)+     let t = Transaction (parsedate "2009/01/01") Nothing False "" "a" "" []+             [Posting False "b" (Mixed [dollars 1.00]) "" RegularPosting [] (Just t)+             ,Posting False "c" (Mixed [dollars (-1.00)]) "" RegularPosting [] (Just t)              ] ""-     assertBool "detect balanced" (isTransactionBalanced t)-     let t = Transaction (parsedate "2009/01/01") Nothing False "" "a" ""-             [Posting False "b" (Mixed [dollars 1.00]) "" RegularPosting (Just t)-             ,Posting False "c" (Mixed [dollars (-1.01)]) "" RegularPosting (Just t)+     assertBool "detect balanced" (isTransactionBalanced Nothing t)+     let t = Transaction (parsedate "2009/01/01") Nothing False "" "a" "" []+             [Posting False "b" (Mixed [dollars 1.00]) "" RegularPosting [] (Just t)+             ,Posting False "c" (Mixed [dollars (-1.01)]) "" RegularPosting [] (Just t)              ] ""-     assertBool "detect unbalanced" (not $ isTransactionBalanced t)-     let t = Transaction (parsedate "2009/01/01") Nothing False "" "a" ""-             [Posting False "b" (Mixed [dollars 1.00]) "" RegularPosting (Just t)+     assertBool "detect unbalanced" (not $ isTransactionBalanced Nothing t)+     let t = Transaction (parsedate "2009/01/01") Nothing False "" "a" "" []+             [Posting False "b" (Mixed [dollars 1.00]) "" RegularPosting [] (Just t)              ] ""-     assertBool "detect unbalanced, one posting" (not $ isTransactionBalanced t)-     let t = Transaction (parsedate "2009/01/01") Nothing False "" "a" ""-             [Posting False "b" (Mixed [dollars 0]) "" RegularPosting (Just t)+     assertBool "detect unbalanced, one posting" (not $ isTransactionBalanced Nothing t)+     let t = Transaction (parsedate "2009/01/01") Nothing False "" "a" "" []+             [Posting False "b" (Mixed [dollars 0]) "" RegularPosting [] (Just t)              ] ""-     assertBool "one zero posting is considered balanced for now" (isTransactionBalanced t)-     let t = Transaction (parsedate "2009/01/01") Nothing False "" "a" ""-             [Posting False "b" (Mixed [dollars 1.00]) "" RegularPosting (Just t)-             ,Posting False "c" (Mixed [dollars (-1.00)]) "" RegularPosting (Just t)-             ,Posting False "d" (Mixed [dollars 100]) "" VirtualPosting (Just t)+     assertBool "one zero posting is considered balanced for now" (isTransactionBalanced Nothing t)+     let t = Transaction (parsedate "2009/01/01") Nothing False "" "a" "" []+             [Posting False "b" (Mixed [dollars 1.00]) "" RegularPosting [] (Just t)+             ,Posting False "c" (Mixed [dollars (-1.00)]) "" RegularPosting [] (Just t)+             ,Posting False "d" (Mixed [dollars 100]) "" VirtualPosting [] (Just t)              ] ""-     assertBool "virtual postings don't need to balance" (isTransactionBalanced t)-     let t = Transaction (parsedate "2009/01/01") Nothing False "" "a" ""-             [Posting False "b" (Mixed [dollars 1.00]) "" RegularPosting (Just t)-             ,Posting False "c" (Mixed [dollars (-1.00)]) "" RegularPosting (Just t)-             ,Posting False "d" (Mixed [dollars 100]) "" BalancedVirtualPosting (Just t)+     assertBool "virtual postings don't need to balance" (isTransactionBalanced Nothing t)+     let t = Transaction (parsedate "2009/01/01") Nothing False "" "a" "" []+             [Posting False "b" (Mixed [dollars 1.00]) "" RegularPosting [] (Just t)+             ,Posting False "c" (Mixed [dollars (-1.00)]) "" RegularPosting [] (Just t)+             ,Posting False "d" (Mixed [dollars 100]) "" BalancedVirtualPosting [] (Just t)              ] ""-     assertBool "balanced virtual postings need to balance among themselves" (not $ isTransactionBalanced t)-     let t = Transaction (parsedate "2009/01/01") Nothing False "" "a" ""-             [Posting False "b" (Mixed [dollars 1.00]) "" RegularPosting (Just t)-             ,Posting False "c" (Mixed [dollars (-1.00)]) "" RegularPosting (Just t)-             ,Posting False "d" (Mixed [dollars 100]) "" BalancedVirtualPosting (Just t)-             ,Posting False "e" (Mixed [dollars (-100)]) "" BalancedVirtualPosting (Just t)+     assertBool "balanced virtual postings need to balance among themselves" (not $ isTransactionBalanced Nothing t)+     let t = Transaction (parsedate "2009/01/01") Nothing False "" "a" "" []+             [Posting False "b" (Mixed [dollars 1.00]) "" RegularPosting [] (Just t)+             ,Posting False "c" (Mixed [dollars (-1.00)]) "" RegularPosting [] (Just t)+             ,Posting False "d" (Mixed [dollars 100]) "" BalancedVirtualPosting [] (Just t)+             ,Posting False "e" (Mixed [dollars (-100)]) "" BalancedVirtualPosting [] (Just t)              ] ""-     assertBool "balanced virtual postings need to balance among themselves (2)" (isTransactionBalanced t)+     assertBool "balanced virtual postings need to balance among themselves (2)" (isTransactionBalanced Nothing t)    ,"isSubAccountNameOf" ~: do     "assets" `isSubAccountNameOf` "assets" `is` False@@ -895,6 +894,7 @@              tcode="*",              tdescription="opening balance",              tcomment="",+             tmetadata=[],              tpostings=[               Posting {                 pstatus=False,@@ -902,6 +902,7 @@                 pamount=(Mixed [dollars 4.82]),                 pcomment="",                 ptype=RegularPosting,+                pmetadata=[],                 ptransaction=Nothing               },               Posting {@@ -910,6 +911,7 @@                 pamount=(Mixed [dollars (-4.82)]),                 pcomment="",                 ptype=RegularPosting,+                pmetadata=[],                 ptransaction=Nothing               }              ],@@ -923,6 +925,7 @@              tcode="*",              tdescription="ayres suites",              tcomment="",+             tmetadata=[],              tpostings=[               Posting {                 pstatus=False,@@ -930,6 +933,7 @@                 pamount=(Mixed [dollars 179.92]),                 pcomment="",                 ptype=RegularPosting,+                pmetadata=[],                 ptransaction=Nothing               },               Posting {@@ -938,6 +942,7 @@                 pamount=(Mixed [dollars (-179.92)]),                 pcomment="",                 ptype=RegularPosting,+                pmetadata=[],                 ptransaction=Nothing               }              ],@@ -951,6 +956,7 @@              tcode="*",              tdescription="auto transfer to savings",              tcomment="",+             tmetadata=[],              tpostings=[               Posting {                 pstatus=False,@@ -958,6 +964,7 @@                 pamount=(Mixed [dollars 200]),                 pcomment="",                 ptype=RegularPosting,+                pmetadata=[],                 ptransaction=Nothing               },               Posting {@@ -966,6 +973,7 @@                 pamount=(Mixed [dollars (-200)]),                 pcomment="",                 ptype=RegularPosting,+                pmetadata=[],                 ptransaction=Nothing               }              ],@@ -979,6 +987,7 @@              tcode="*",              tdescription="poquito mas",              tcomment="",+             tmetadata=[],              tpostings=[               Posting {                 pstatus=False,@@ -986,6 +995,7 @@                 pamount=(Mixed [dollars 4.82]),                 pcomment="",                 ptype=RegularPosting,+                pmetadata=[],                 ptransaction=Nothing               },               Posting {@@ -994,6 +1004,7 @@                 pamount=(Mixed [dollars (-4.82)]),                 pcomment="",                 ptype=RegularPosting,+                pmetadata=[],                 ptransaction=Nothing               }              ],@@ -1007,6 +1018,7 @@              tcode="*",              tdescription="verizon",              tcomment="",+             tmetadata=[],              tpostings=[               Posting {                 pstatus=False,@@ -1014,6 +1026,7 @@                 pamount=(Mixed [dollars 95.11]),                 pcomment="",                 ptype=RegularPosting,+                pmetadata=[],                 ptransaction=Nothing               },               Posting {@@ -1022,6 +1035,7 @@                 pamount=(Mixed [dollars (-95.11)]),                 pcomment="",                 ptype=RegularPosting,+                pmetadata=[],                 ptransaction=Nothing               }              ],@@ -1035,6 +1049,7 @@              tcode="*",              tdescription="discover",              tcomment="",+             tmetadata=[],              tpostings=[               Posting {                 pstatus=False,@@ -1042,6 +1057,7 @@                 pamount=(Mixed [dollars 80]),                 pcomment="",                 ptype=RegularPosting,+                pmetadata=[],                 ptransaction=Nothing               },               Posting {@@ -1050,6 +1066,7 @@                 pamount=(Mixed [dollars (-80)]),                 pcomment="",                 ptype=RegularPosting,+                pmetadata=[],                 ptransaction=Nothing               }              ],@@ -1059,9 +1076,9 @@           []           []           ""-          ""+          nullctx+          []           (TOD 0 0)-          ""  ledger7 = journalToLedger nullfilterspec journal7 @@ -1091,8 +1108,8 @@         []         []         ""-        ""+        nullctx+        []         (TOD 0 0)-        ""-    where parse = fromparse . parseWithCtx emptyCtx someamount+    where parse = fromparse . parseWithCtx nullctx someamount 

@@ -13,15 +13,18 @@      journalReload,      journalReloadIfChanged,      journalFileIsNewer,-     journalFileModificationTime,+     journalSpecifiedFileIsNewer,+     fileModificationTime,      openBrowserOn,      writeFileWithBackup,      writeFileWithBackupIfChanged,+     readFileStrictly,     ) where import Hledger.Data import Hledger.Read import Hledger.Cli.Options (Opt(..),journalFilePathFromOpts) -- ,optsToFilterSpec)+import Control.Exception import Safe (readMay) import System.Directory (getModificationTime, getDirectoryContents, copyFile) import System.Exit@@ -38,7 +41,7 @@   -- We kludgily read the file before parsing to grab the full text, unless   -- it's stdin, or it doesn't exist and we are adding. We read it strictly   -- to let the add command work.-  journalFilePathFromOpts opts >>= readJournalFile Nothing >>= either (error'.trace "BBB") runcmd+  journalFilePathFromOpts opts >>= readJournalFile Nothing >>= either error' runcmd     where       costify = (if CostBasis `elem` opts then journalConvertAmountsToCost else id)       runcmd = cmd opts args . costify@@ -52,7 +55,7 @@  -- | Re-read a journal from its data file, or return an error string. journalReload :: Journal -> IO (Either String Journal)-journalReload Journal{filepath=f} = readJournalFile Nothing f+journalReload j = readJournalFile Nothing $ journalFilePath j  -- | Re-read a journal from its data file mostly, only if the file has -- changed since last read (or if there is no file, ie data read from@@ -60,26 +63,36 @@ -- the error message while reading it, and a flag indicating whether it -- was re-read or not. journalReloadIfChanged :: [Opt] -> Journal -> IO (Either String Journal, Bool)-journalReloadIfChanged opts j@Journal{filepath=f} = do-  changed <- journalFileIsNewer j-  if changed+journalReloadIfChanged opts j = do+  let maybeChangedFilename f = do newer <- journalSpecifiedFileIsNewer j f+                                  return $ if newer then Just f else Nothing+  changedfiles <- catMaybes `fmap` mapM maybeChangedFilename (journalFilePaths j)+  if not $ null changedfiles    then do-     when (Verbose `elem` opts) $ printf "%s has changed, reloading\n" f+     when (Verbose `elem` opts) $ printf "%s has changed, reloading\n" (head changedfiles)      jE <- journalReload j      return (jE, True)    else      return (Right j, False) --- | Has the journal's data file changed since last parsed ?+-- | Has the journal's main data file changed since the journal was last+-- read ? journalFileIsNewer :: Journal -> IO Bool journalFileIsNewer j@Journal{filereadtime=tread} = do-  tmod <- journalFileModificationTime j+  tmod <- fileModificationTime $ journalFilePath j   return $ diffClockTimes tmod tread > (TimeDiff 0 0 0 0 0 0 0) --- | Get the last modified time of the journal's data file (or if there is no--- file, the current time).-journalFileModificationTime :: Journal -> IO ClockTime-journalFileModificationTime Journal{filepath=f}+-- | Has the specified file (presumably one of journal's data files)+-- changed since journal was last read ?+journalSpecifiedFileIsNewer :: Journal -> FilePath -> IO Bool+journalSpecifiedFileIsNewer Journal{filereadtime=tread} f = do+  tmod <- fileModificationTime f+  return $ diffClockTimes tmod tread > (TimeDiff 0 0 0 0 0 0 0)++-- | Get the last modified time of the specified file, or if it does not+-- exist or there is some other error, the current time.+fileModificationTime :: FilePath -> IO ClockTime+fileModificationTime f     | null f = getClockTime     | otherwise = getModificationTime f `Prelude.catch` \_ -> getClockTime @@ -119,6 +132,9 @@ -- overwrite it with this new text, or give an error. writeFileWithBackup :: FilePath -> String -> IO () writeFileWithBackup f t = backUpFile f >> writeFile f t++readFileStrictly :: FilePath -> IO String+readFileStrictly f = readFile f >>= \s -> Control.Exception.evaluate (length s) >> return s  -- | Back up this file with a (incrementing) numbered suffix, or give an error. backUpFile :: FilePath -> IO ()

@@ -4,29 +4,62 @@ numbering policy. -} -module Hledger.Cli.Version+module Hledger.Cli.Version (+                            version+                           ,progversionstr+                           ,binaryfilename+) where import System.Info (os, arch)+ import Hledger.Data.Utils --- version and PATCHLEVEL are set by the makefile-version       = "0.12.1" +-- version and PATCHLEVEL are set by the make process++version       = "0.13.0"+ #ifdef PATCHLEVEL patchlevel = "." ++ show PATCHLEVEL -- must be numeric ! #else patchlevel = "" #endif -progname      = "hledger"-timeprogname  = "hours"- buildversion  = version ++ patchlevel :: String -binaryfilename = prettify $ splitAtElement '.' buildversion :: String+-- | Given a program name, return a human-readable version string.  For+-- development builds, at least non-cabal builds, the patch level (ie the+-- number of patches applied since last release tag) will also be+-- included.+progversionstr :: String -> String+progversionstr progname = progname ++ "-" ++ versionstr ++ configmsg+    where+      versionstr = prettify $ splitAtElement '.' buildversion+          where+            prettify (major:minor:bugfix:patches:[]) =+                printf "%s.%s%s%s" major minor bugfix' patches'+                    where+                      bugfix'+                          | bugfix `elem` ["0"{-,"98","99"-}] = ""+                          | otherwise = '.' : bugfix+                      patches'+                          | patches/="0" = "+"++patches+                          | otherwise = ""+            prettify s = intercalate "." s++      configmsg | null buildflags = ""+                | otherwise       = " with " ++ intercalate ", " buildflags++      buildflags = []++-- | Given a program name, return a precise platform-specific executable+-- name suitable for naming downloadable binaries.  Can raise an error if+-- the version and patch level was not defined correctly at build time.+binaryfilename :: String -> String+binaryfilename progname = prettify $ splitAtElement '.' buildversion                 where                   prettify (major:minor:bugfix:patches:[]) =-                      printf "hledger-%s.%s%s%s-%s-%s%s" major minor bugfix' patches' os' arch suffix+                      printf "%s-%s.%s%s%s-%s-%s%s" progname major minor bugfix' patches' os' arch suffix                           where                             bugfix'                                 | bugfix `elem` ["0"{-,"98","99"-}] = ""@@ -43,33 +76,3 @@                   prettify (major:[])              = prettify [major,"0","0","0"]                   prettify []                      = error' "VERSION is empty, please fix"                   prettify _                       = error' "VERSION has too many components, please fix"--versionstr    = prettify $ splitAtElement '.' buildversion :: String-                where-                  prettify (major:minor:bugfix:patches:[]) =-                      printf "%s.%s%s%s" major minor bugfix' patches'-                          where-                            bugfix'-                                | bugfix `elem` ["0"{-,"98","99"-}] = ""-                                | otherwise = '.' : bugfix-                            patches'-                                | patches/="0" = "+"++patches-                                | otherwise = ""-                  prettify s = intercalate "." s--versionmsg    = progname ++ "-" ++ versionstr ++ configmsg :: String-    where configmsg-              | null configflags = " with no extras"-              | otherwise = " with " ++ intercalate ", " configflags--configflags   = tail [""-#ifdef CHART-  ,"chart"-#endif-#ifdef VTY-  ,"vty"-#endif-#if defined(WEB)-  ,"web"-#endif- ]

@@ -1,1121 +0,0 @@-----title: hledger manual------# hledger manual--This is the official hledger manual, for version 0.12.1.  You may also-want to visit the rest of [hledger.org](http://hledger.org), and for-background,-[c++ ledger's manual](http://joyful.com/repos/ledger/doc/ledger.html).--## User Guide--### Introduction--hledger is a program for tracking money, time, or any other commodity,-using a plain text file format and the simple but powerful principles of-double-entry accounting.--It is modelled closely on-[John Wiegley's ledger](http://wiki.github.com/jwiegley/ledger) (aka "c++-ledger"), with some features removed and some new ones added. I wrote-hledger because I wanted to build financial tools in the Haskell-programming language rather than in C++.--hledger's basic function is to generate register and balance reports from-a plain text general journal file, at the command line or via the web or-curses interface. You can use it to, eg,---   track spending and income--   see time reports by day/week/month/project--   get accurate numbers for client billing and tax filing--   track invoices--hledger aims to help both computer experts and every-day users gain-clarity in their finances and time management. For now though, it is most-useful to technically-minded folks who are comfortable with command-line-tools.--hledger is copyright (c) 2007-2009 Simon Michael-<[simon@joyful.com](mailto:simon@joyful.com)\> and contributors and-released as Free Software under GPL version 3 or later.--### Installing--hledger works on all major platforms. Here are the [release-notes](http://hledger.org/NEWS.html), and pre-built-[binaries](http://hledger.org/binaries/) you should be able to-download and run. If not, or if you prefer an up-to-date build,-open a shell/terminal/command window and:--1. **ensure you have GHC (6.10 or newer) and cabal-install**--        $ ghc --version-        $ cabal --version--    If not, download and install the [Haskell-    Platform](http://hackage.haskell.org/platform/).  Or, you may be-    able to use your platform's packaging system, eg on ubuntu lucid-    do `apt-get install ghc6 cabal-install zlib1g-dev`.  Also make-    sure `~/.cabal/bin` is in your PATH.--2. **install hledger with cabal-install**--        $ cabal update-        $ cabal install hledger--#### Install options--You can add the following options to the basic `cabal install hledger`-command to build extra features. I recommend you get the basic install-working first, then try these one at a time:--- `-fweb` builds the [web](#web) command, enabling a web-based user-  interface. This requires GHC 6.12 or greater.--- `-fvty` builds the [vty](#vty) command, enabling a basic-  curses-style user interface. This does not work on microsoft-  windows, unless possibly with cygwin.--- `-fchart` builds the [chart](#chart) command, enabling rudimentary-  pie chart generation. This requires additional GTK-related libraries-  (on ubuntu: `apt-get install libghc6-gtk-dev`) and possibly [other-  things](http://code.haskell.org/gtk2hs/INSTALL).--#### If you have trouble..--proceed to [Troubleshooting](#troubleshooting) for help!--### Basic usage--Basic usage is:--    $ hledger [OPTIONS] [COMMAND [PATTERNS]]--[OPTIONS](#overview) may appear anywhere on the command line.-[COMMAND](#commands) is one of: add, balance, chart, convert, histogram,-print, register, stats, ui, web, test (defaulting to balance). The-optional [PATTERNS](#filter-patterns) are regular expressions which select-a subset of the journal data.--hledger looks for data in a journal file, usually `.journal` in your home-directory. You can specify a different file with the -f option (use - for-standard input) or `LEDGER` environment variable.--To get started, make yourself a journal file containing some-transactions. You can copy the sample file below (or-[sample.journal](http://joyful.com/repos/hledger/data/sample.journal)) and save-it as `.journal` in your home directory. Or, just run `hledger add` and-enter a few transactions. Now you can try some of these commands, or read-on:--    $ hledger --help                        # show command-line help-    $ hledger balance                       # all accounts with aggregated balances-    $ hledger bal --depth 1                 # only top-level accounts-    $ hledger register                      # transaction register-    $ hledger reg income                    # transactions to/from an income account-    $ hledger reg checking                  # checking transactions-    $ hledger reg desc:shop                 # transactions with shop in the description-    $ hledger histogram                     # transactions per day, or other interval-    $ hledger add                           # add some new transactions to the journal file-    $ hledger vty                           # curses ui, if installed with -fvty-    $ hledger web                           # web ui, if installed with -fweb-    $ hledger chart                         # make a balance chart, if installed with -fchart--You'll find more examples below.--<a name="file-format" />--#### Journal file--hledger reads data from a plain text file, called a *journal* because-it represents a standard accounting [general-journal](http://en.wikipedia.org/wiki/General_journal).  It contains a-number of transactions, each describing a transfer of money (or-any commodity) between two or more named accounts, in a simple-format readable by both hledger and humans.--You can use hledger without learning any more about this file; just-use the [add](#add) or [web](#web) commands.--Many users, though, edit the journal file directly with a text-editor. This is a distinguishing feature of hledger (and c++ ledger.)-You can even do this while the web interface is running, and see the-changes right away.--Here's an example:--    ; A sample journal file. This is a comment.-    -    2008/01/01 income               ; <- transaction's first line starts in column 0, contains date and description-        assets:bank:checking  $1    ; <- posting lines start with whitespace, each contains an account name-        income:salary        $-1    ;    followed by at least two spaces and an amount-    -    2008/06/01 gift-        assets:bank:checking  $1    ; <- at least two postings in a transaction-        income:gifts         $-1    ; <- their amounts must balance to 0-    -    2008/06/02 save-        assets:bank:saving    $1-        assets:bank:checking        ; <- one amount may be omitted; here $-1 is inferred-    -    2008/06/03 eat & shop           ; <- description can be anything-        expenses:food         $1-        expenses:supplies     $1    ; <- this transaction debits two expense accounts-        assets:cash                 ; <- $-2 inferred-    -    2008/12/31 * pay off            ; <- an optional * after the date means "cleared" (or anything you want)-        liabilities:debts     $1-        assets:bank:checking--Each transaction has a date, optional description, and two or more-postings, of some amount to some account. The amounts within a transaction must balance,-ie add up to 0. Or, you can leave one amount blank and it will be inferred.--Note that account names may contain single spaces, while the amount must-be separated from the account name by at least two spaces.--An amount is a number, with an optional currency symbol or commodity name-on either the left or right. Commodity names which contain more than just-letters should be enclosed in double quotes. Negative amounts usually have-the minus sign next to the number (`$-1`), but it may also go before the-currency symbol/commodity name (`-$1`).--hledger's file format aims to be compatible with c++ ledger, so you-can use both tools on your journal. For more details, see [File format-compatibility](#file-format-compatibility).--## Reference--### Overview--This version of hledger mimics a subset of ledger 3.x, and adds some-features of its own. We currently support regular journal transactions, timelog-entries, multiple commodities, (fixed) price history, virtual postings,-filtering by account and description, the familiar print, register &-balance commands and several new commands. We handle (almost) the full-period expression syntax, and very limited display expressions consisting-of a simple date predicate.--Here is the command-line help:--    Usage: hledger [OPTIONS] COMMAND [PATTERNS]-           hledger [OPTIONS] convert CSVFILE-           hledger [OPTIONS] stats--    hledger reads your ~/.journal file, or another specified with $LEDGER or -f FILE--    COMMAND is one of (may be abbreviated):-      add       - prompt for new transactions and add them to the journal-      balance   - show accounts, with balances-      convert   - read CSV bank data and display in journal format-      histogram - show a barchart of transactions per day or other interval-      print     - show transactions in journal format-      register  - show transactions as a register with running balance-      stats     - show various statistics for a journal-      vty       - run a simple curses-style UI (if installed with -fvty)-      web       - run a simple web-based UI (if installed with -fweb-      chart     - generate balances pie charts (if installed with -fchart)-      test      - run self-tests--    PATTERNS are regular expressions which filter by account name.-    Prefix with desc: to filter by transaction description instead.-    Prefix with not: to negate a pattern. When using both, not: comes last.--    DATES can be y/m/d or ledger-style smart dates like "last month".--    Use --help-options to see OPTIONS, or --help-all/-H.--    Options:--      -f FILE  --file=FILE        use a different journal/timelog file; - means stdin-               --no-new-accounts  don't allow to create new accounts-      -b DATE  --begin=DATE       report on transactions on or after this date-      -e DATE  --end=DATE         report on transactions before this date-      -p EXPR  --period=EXPR      report on transactions during the specified period-                                  and/or with the specified reporting interval-      -C       --cleared          report only on cleared transactions-      -U       --uncleared        report only on uncleared transactions-      -B       --cost, --basis    report cost of commodities-               --depth=N          hide sub-accounts deeper than this-      -d EXPR  --display=EXPR     show only transactions matching EXPR (where-                                  EXPR is 'dOP[DATE]' and OP is <, <=, =, >=, >)-               --effective        use transactions' effective dates, if any-      -E       --empty            show empty/zero things which are normally elided-      -R       --real             report only on real (non-virtual) transactions-               --flat             balance: show full account names, unindented-               --drop=N           balance: with --flat, elide first N account name components-               --no-total         balance: hide the final total-      -D       --daily            register, stats: report by day-      -W       --weekly           register, stats: report by week-      -M       --monthly          register, stats: report by month-      -Q       --quarterly        register, stats: report by quarter-      -Y       --yearly           register, stats: report by year-      -v       --verbose          show more verbose output-               --debug            show extra debug output; implies verbose-               --binary-filename  show the download filename for this hledger build-      -V       --version          show version information-      -h       --help             show basic command-line usage-               --help-options     show command-line options-      -H       --help-all         show command-line usage and options--### Commands--#### Reporting commands--These commands are read-only, that is they never modify your data.--##### print--The print command displays full transactions from the journal file, tidily-formatted and showing all amounts explicitly. The output of print is-always a valid hledger journal.--hledger's print command also shows all unit prices in effect, or (with--B/--cost) shows cost amounts.--Examples:--    $ hledger print-    $ hledger print employees:bob | hledger -f- register expenses--##### register--The register command displays postings, one per line, and their running total.-With no [filter patterns](#filter-patterns), this is not all that different from [print](#print):--    $ hledger register--More typically, use it to see a specific account's activity:--    $ hledger register assets:bank:checking--The `--depth` option limits the amount of sub-account detail displayed:--    $ hledger register assets:bank:checking --depth 2--With a [reporting interval](#reporting-interval) it shows aggregated-summary postings within each interval:--    $ hledger register --monthly rent-    $ hledger register --monthly -E food --depth 4--##### balance--The balance command displays accounts and their balances, indented to show the account hierarchy.-Examples:--    $ hledger balance-    $ hledger balance food -p 'last month'--A final total is displayed, use `--no-total` to suppress this. Also, the-`--depth N` option shows accounts only to the specified depth, useful for-an overview:--    $ for y in 2006 2007 2008 2009 2010; do echo; echo $y; hledger -f $y.journal balance ^expenses --depth 2; done--With `--flat`, a non-hierarchical list of full account names is displayed-instead. This mode shows just the accounts actually contributing to the-balance, making the arithmetic a little more obvious to non-hledger users.-In this mode you can also use `--drop N` to elide the first few account-name components. Note `--depth` doesn't work too well with `--flat` currently;-it hides deeper accounts rather than aggregating them.--##### chart--The chart command saves a pie chart of your top account balances to an-image file (usually "hledger.png", or use -o/--output FILE). You can-adjust the image resolution with --size=WIDTHxHEIGHT, and the number of-accounts with --items=N.--Note that positive and negative balances will not be displayed together in-the same chart; any balances not matching the sign of the first one will-be omitted.--To show only accounts above a certain depth, use the --depth-option. Otherwise, the chart can include accounts at any depth. If a-parent and child account are both displayed, the parent's balance excludes-the child's.--Examples:--    $ hledger chart assets --depth 2-    $ hledger chart liabilities --depth 2-    $ hledger chart ^expenses -o balance.png --size 1000x600 --items 20-    $ for m in 01 02 03 04 05 06 07 08 09 10 11 12; do hledger -p 2009/$m chart ^expenses --depth 2 -o expenses-2009$m.png --size 400x300; done--This is an optional feature; see [installing](#installing).--##### histogram--The histogram command displays a quick bar chart showing transaction-counts, per day, week, month or other reporting interval. It is-experimental.--Examples:--    $ hledger histogram -p weekly dining--##### stats--The stats command displays quick summary information for the whole journal,-or by period.--Examples:--    $ hledger stats-    $ hledger stats -p 'monthly in 2009'--##### vty--The vty command starts hledger's curses (full-screen, text) user interface,-which allows interactive navigation of the print/register/balance-reports. This lets you browse around your numbers and get quick insights-with less typing.--Examples:--    $ hledger vty-    $ hledger vty -BE food--This is an optional feature; see [installing](#installing).--#### Modifying commands--The following commands can alter your journal file.--##### add--The add command prompts interactively for new transactions, and adds them-to the journal. It is experimental.--Examples:--    $ hledger add-    $ hledger add accounts:personal:bob--##### web--The web command starts hledger's web interface, and tries to open a web-browser to view it. (If this fails, you'll have to manually visit the url-it displays.) The web interface combines the features of the print,-register, balance and add commands, and adds a general edit command.--This is an optional feature. Note there is also an older implementation of-the web command which does not provide edit. See [installing](#installing).--Examples:--    $ hledger web-    $ hledger web -E -B --depth 2-    $ hledger web --port 5010 --base-url http://some.vhost.com --debug -f my.journal--Warning: unlike all other hledger features, the edit form can alter your-existing journal data.  You can edit, or erase, the journal file through-the web ui. There is currently no access control. A numbered backup of the-file will be saved at each edit, in normal circumstances (eg if file-permissions allow, disk is not full, etc.)--There are some options specific to the web server:--    --port=N           web: serve on tcp port N (default 5000)--hledger will serve pages on port 5000 by default.--    --base-url=URL     web: use this base url (default http://localhost:PORT)--Hyperlinks in the web interface all point to "localhost" by default, so if-you want to visit the hledger web server from other machines, you'll need-to use this option. Just give your machine's host name or ip address-instead of localhost. This option may also be useful when running hledger-behind a reverse proxy, to conform to your url scheme. Note that the PORT-in the base url need not be the same as the `--port` argument.--#### Other commands--##### convert--The convert command reads a-[CSV](http://en.wikipedia.org/wiki/Comma-separated_values) file you have-downloaded from your bank, and prints out the transactions in journal-format, suitable for adding to your journal. It does not alter your journal-directly.--This can be a lot quicker than entering every transaction by hand.  (The-downside is that you are less likely to notice if your bank makes an-error!) Use it like this:--    $ hledger convert FILE.csv >FILE.journal--where FILE.csv is your downloaded csv file. This will convert the csv data-using conversion rules defined in FILE.rules (auto-creating this file if-needed), and save the output into a temporary journal file. Then you should-review FILE.journal for problems; update the rules and convert again if-needed; and finally copy/paste transactions which are new into your main-journal.--###### .rules file--convert requires a \*.rules file containing data definitions and rules for-assigning destination accounts to transactions; it will be auto-created if-missing. Typically you will have one csv file and one rules file per bank-account. Here's an example rules file for converting csv data from a Wells-Fargo checking account:--    base-account assets:bank:checking-    date-field 0-    description-field 4-    amount-field 1-    currency $-    -    ; account-assigning rules:-    -    SPECTRUM-    expenses:health:gym-    -    ITUNES-    BLKBSTR=BLOCKBUSTER-    expenses:entertainment-    -    (TO|FROM) SAVINGS-    assets:bank:savings--This says:---   the account corresponding to this csv file is-    assets:bank:checking--   the first csv field is the date, the second is the amount, the-    fifth is the description--   prepend a dollar sign to the amount field--   if description contains SPECTRUM (case-insensitive), the-    transaction is a gym expense--   if description contains ITUNES or BLKBSTR, the transaction is-    an entertainment expense; also rewrite BLKBSTR as BLOCKBUSTER--   if description contains TO SAVINGS or FROM SAVINGS, the-    transaction is a savings transfer--Notes:---   Lines beginning with ; or \# are ignored (but avoid using inside an-    account rule)---   Definitions must come first, one per line, all in one-    paragraph. Each is a name and a value separated by whitespace.-    Supported names are: base-account, date-field, status-field,-    code-field, description-field, amount-field, currency-field,-    currency. All are optional and will use defaults if not specified.---   The remainder of the file is account-assigning rules. Each is a-    paragraph consisting of one or more description-matching patterns-    (case-insensitive regular expressions), one per line, followed by-    the account name to use when the transaction's description matches-    any of these patterns.---   A match pattern may be followed by a replacement pattern,-    separated by `=`, which rewrites the matched part of the-    description. Use this if you want to clean up messy bank data. To-    rewrite the entire description, use a match pattern like-    `.*PAT.*=REPL`. Within a replacement pattern, you can refer to the-    matched text with `\0` and any regex groups with `\1`, `\2` in the-    usual way.---##### test--This command runs hledger's internal self-tests and displays a quick-report. The -v option shows more detail, and a pattern can be provided to-filter tests by name. It's mainly used in development, but it's also nice-to be able to run a sanity check at any time..--Examples:--    $ hledger test-    $ hledger test -v balance--### Other features--#### Filter patterns--Most commands accept one or more filter pattern arguments after the-command name, to select a subset of transactions or postings. There are-two kinds of pattern:---   an account pattern, which is a regular expression. This is-    matched against postings' accounts. Optionally, it may be prefixed-    with `not:` in which case the match is negated.---   a description pattern, like the above but prefixed with-    `desc:`. This is matched against transactions' descriptions. Note,-    when negating a desc: pattern, not: goes last, eg:-    `desc:not:someregexp`.---When you specify multiple filter patterns, hledger generally selects the-transactions or postings which match (or negatively match)--> *any of the account patterns* AND-> *any of the description patterns*--The [print](#print) command selects transactions which--> *match any of the description patterns* AND-> *have any postings matching any of the positive account patterns*-> AND-> *have no postings matching any of the negative account patterns*--#### Dates--##### Simple dates--Within a journal file, dates must follow a fairly simple year/month/day-format. Examples:--> `2010/01/31` or `2010/1/31` or `2010-1-31` or `2010.1.31`--The year is optional if you define a [default year](#default-year).--##### Smart dates--In [period expressions](#period-expressions), the `-b` and `-e` options,-the [add](#add) command and the [web](#web) add form, more flexible "smart-dates" are allowed. Here are some examples:---   `2009/1/1`, `2009/01/01`, `2009-1-1`, `2009.1.1`, `2009/1`,-    `2009` (january 1, 2009)--   `1/1`, `january`, `jan`, `this year` (january 1, this year)--   `next year` (january 1, next year)--   `this month` (the 1st of the current month)--   `this week` (the most recent monday)--   `last week` (the monday of the week before this one)--   `today`, `yesterday`, `tomorrow`--Spaces are optional, so eg: `-b lastmonth` is valid.--##### Actual & effective dates--Real-life transactions sometimes have more than one date.  For-example, you might buy a movie ticket on friday with a bank debit-card, and the transaction might appear in your bank account on monday.-hledger and ledger users call these the *effective date* and *actual-date* respectively. We say:--> *"The ticket purchase took EFFECT on friday, but ACTUALly appeared in my bank balance on monday."*--You can often think of effective date as "my date" and actual date as "bank's date".--When these dates differ, as in the example above, hledger's daily-balances will not exactly match your bank's. But exact daily-reconciling can be quite useful, to see precisely when disagreements-arise. There are several ways you can handle this:--1. don't bother with exact daily reconciling; accept temporary-   disagreements between hledger and bank balances.--2. adjust manually recorded transactions to actual bank dates when necessary.-   Your hledger balance will match your bank's exactly, but you no longer have-   a record of when transactions *really* happened.--3. record both dates separated by an equals sign: the *actual date* on-   the left and the *effective date* on the right. The year is-   optional in the second date.--Here's an example of the last approach: on friday 19 you record:--        2010/2/19 movie-          expenses:cinema          $10-          assets:checking--hledger shows $10 less in your checking account through saturday and-sunday.. but your online bank statement does not. It shows the-transaction clearing a few days later, on monday 23. So you then-insert that actual date:--        ;  ACTUAL=EFFECTIVE-        2010/2/23=2010/2/19 movie-          expenses:cinema          $10-          assets:checking--Now your hledger reports match your bank's daily balance exactly,-since they use the actual date by preference. To report based on-effective dates instead, use the `--effective` flag.--##### Default year--You can set a default year with a `Y` directive in the journal, then-subsequent dates may be written as month/day. Eg:--    Y2009-    -    12/15  ; <- equivalent to 2009/12/15-    -    Y2010-    -    1/31  ; <- equivalent to 2010/1/31--#### Period expressions--hledger supports flexible "period expressions" with the `-p/--period`-option to select transactions within a period of time (eg in 2009) and/or-with a reporting interval (eg weekly). hledger period expressions are-similar but not identical to c++ ledger's.--Here is a basic period expression specifying the first quarter of 2009-(start date is always included, end date is always excluded):--    -p "from 2009/1/1 to 2009/4/1"--Keywords like "from" and "to" are optional, and so are the spaces.  Just-don't run two dates together:--    -p2009/1/1to2009/4/1-    -p"2009/1/1 2009/4/1"--Dates are [smart dates](#smart-dates), so if the current year is 2009, the-above can also be written as:--    -p "1/1 to 4/1"-    -p "january to apr"-    -p "this year to 4/1"--If you specify only one date, the missing start or end date will be the-earliest or latest transaction in your journal:--    -p "from 2009/1/1"  (everything after january 1, 2009)-    -p "from 2009/1"    (the same)-    -p "from 2009"      (the same)-    -p "to 2009"        (everything before january 1, 2009)--A single date with no "from" or "to" defines both the start and end date-like so:--    -p "2009"           (the year 2009;    equivalent to "2009/1/1 to 2010/1/1")-    -p "2009/1"         (the month of jan; equivalent to "2009/1/1 to 2009/2/1")-    -p "2009/1/1"       (just that day;    equivalent to "2009/1/1 to 2009/1/2")--The `-b/--begin` and `-e/--end` options may be used as a shorthand for-`-p 'from ...'` and `-p 'to ...'` respectively. But note [-p overrides other flags](#p-overrides-other-flags).--##### Reporting interval--You can also specify a reporting interval, which causes the "register"-command to summarise the transactions in each interval.  It goes before-the dates, and can be: "daily", "weekly", "monthly", "quarterly", or-"yearly". An "in" keyword is optional, and so are the dates:--    -p "weekly from 2009/1/1 to 2009/4/1"-    -p "monthly in 2008"-    -p "monthly from 2008"-    -p "quarterly"--A reporting interval may also be specified with the `-D/--daily`,-`-W/--weekly`, `-M/--monthly`, `-Q/--quarterly`, and `-Y/--yearly`-options. But note...--##### -p overrides other flags--A `-p/--period` option on the command line will cause any-`-b`/`-e`/`-D`/`-W`/`-M`/`-Q`/`-Y` flags to be ignored.--#### Display expressions--A display expression with the `-d/--display` option selects which-transactions will be displayed (unlike a-[period expression](#period-expressions), which selects the transactions-to be used for calculation).--hledger currently supports a very small subset of c++ ledger's display-expressions, namely: transactions before or after a date.  This is-useful for displaying a portion of your checking register with an-accurate running total. Eg, to show the balance since the first of the month:--    $ hledger register -d "d>=[1]"--#### Depth limiting--With the `--depth N` option, reports will show only the uppermost accounts-in the account tree, down to level N. See the [balance](#balance),-[register](#register) and [chart](#chart) examples.--#### Prices--You can specify a commodity's unit price, or exchange rate, in terms of-another commodity. There are two ways.--First, you can set the price explicitly for a single posting by writing `@-PRICE` after the amount. PRICE is another amount in a different-commodity. Eg, here one hundred euros was purchased at $1.35 per euro:--    2009/1/2 x-     expenses:foreign currency       €100 @ $1.35-     assets--Secondly, you can set the price for a commodity as of a certain date, by-entering a historical price record. These are lines beginning with "P",-appearing anywhere in the journal between transactions. Eg, here we say the-exchange rate for 1 euro is $1.35 on 2009/1/1 (and thereafter, until a-newer price record is found):--    P 2009/1/1 € $1.35  ; <- historical price: P, date, commodity symbol, price in 2nd commodity (space-separated)-    -    2009/1/2 x-     expenses:foreign currency       €100-     assets--The print command shows any unit prices in effect. Either example above-will show:--    $ hledger print-    2009/01/02 x-        expenses:foreign currency  €100 @ $1.35-        assets                     €-100 @ $1.35--To see amounts converted to their total cost, use the `--cost/-B` flag-with any command:--    $ hledger print --cost-    2009/01/02 x-        expenses:foreign currency       $135.00-        assets                         $-135.00--The `--cost/-B` flag does only one lookup step, ie it will not look up the-price of a price's commodity.--Note hledger handles prices differently from c++ ledger in one important-respect: we assume unit prices do not vary over time.  This is good for-simple reporting of foreign currency transactions, but not for tracking-fluctuating-value investments or capital gains.--#### Including other files--You can pull in the content of additional journal files, by writing lines like this:--    !include path/to/file.journal--The `!include` directive may only be used in journal files, and currently-it may only include other journal files (eg, not timelog files.)--#### Default parent account--You can specify a default parent account within a section of the journal with-the `!account` directive:--    !account home-    -    2010/1/1-        food    $10-        cash-    -    !end--If `!end` is omitted, the effect lasts to the end of the file.-The above is equivalent to:--    2010/01/01-        home:food           $10-        home:cash          $-10--Included files are also affected, eg:--    !account business-    !include biz.journal-    !end-    !account personal-    !include personal.journal-    !end--#### Timelog reporting--hledger will also read timelog files in timeclock.el format. As a-convenience, if you invoke hledger via an "hours" symlink or copy, it uses-your timelog file (`~/.timelog` or `$TIMELOG`) by default, rather than your-journal.--Timelog entries look like this:--    i 2009/03/31 22:21:45 some:project-    o 2009/04/01 02:00:34--The clockin description is treated as an account name. Here are some-queries to try (after downloading-[sample.timelog](http://joyful.com/repos/hledger/sample.timelog)):--    ln -s `which hledger` ~/bin/hours            # set up "hours" in your path-    export TIMELOG=sample.timelog-    hours                                        # show all time balances-    hours -p 'last week'                         # last week-    hours -p thismonth                           # the space is optional-    hours -p 'from 1/15' register project        # project sessions since jan 15-    hours -p 'weekly' reg --depth 1 -E           # weekly time summary--This is a useful feature, if you can find a way to efficiently record-timelog entries. The "ti" and "to" scripts may be available from the c++-ledger 2.x repository. I use-[timeclock-x.el](http://www.emacswiki.org/emacs/timeclock-x.el) and-[ledgerutils.el](http://joyful.com/repos/ledgertools/ledgerutils.el) in-emacs.--### Compatibility with c++ ledger--#### Implementation--Unlike c++ ledger, hledger is written in the Haskell programming-language. Haskell enables a coding style known as pure lazy functional-programming, which holds the promise of more robust and maintainable-software built with fewer lines of code. Haskell also provides a more-abstracted, portable platform which can make deployment and installation-easier in some cases. Haskell also brings some new challenges such as-managing memory growth.--#### File format compatibility--hledger's file format is mostly identical with that of c++ ledger version-2, with some features (like modifier and periodic entries) being accepted,-but ignored. There are also some subtle differences in parser behaviour-(eg comments may be permissible in different places.) C++ ledger version 3-has introduced additional syntax, which current hledger probably fails to-parse.--Generally, it's easy to keep a journal file that works with both hledger-and c++ledger if you avoid the more esoteric syntax.  Occasionally you'll-need to make small edits to restore compatibility for one or the other.--hledger does not allow separate dates for individual postings, unlike c++-ledger.--#### Features not supported--c++ ledger features not currently supported include: modifier and periodic-entries, and the following c++ ledger options and commands:--    Basic options:-    -o, --output FILE      write output to FILE-    -i, --init-file FILE   initialize ledger using FILE (default: ~/.ledgerrc)-    -a, --account NAME     use NAME for the default account (useful with QIF)-    -    Report filtering:-    -c, --current          show only current and past entries (not future)-        --period-sort EXPR sort each report period's entries by EXPR-    -L, --actual           consider only actual (non-automated) transactions-    -r, --related          calculate report using related transactions-        --budget           generate budget entries based on periodic entries-        --add-budget       show all transactions plus the budget-        --unbudgeted       show only unbudgeted transactions-        --forecast EXPR    generate forecast entries while EXPR is true-    -l, --limit EXPR       calculate only transactions matching EXPR-    -t, --amount EXPR      use EXPR to calculate the displayed amount-    -T, --total EXPR       use EXPR to calculate the displayed total-    -    Output customization:-    -n, --collapse         Only show totals in the top-most accounts.-    -s, --subtotal         other: show subtotals-    -P, --by-payee         show summarized totals by payee-    -x, --comm-as-payee    set commodity name as the payee, for reporting-        --dow              show a days-of-the-week report-    -S, --sort EXPR        sort report according to the value expression EXPR-    -w, --wide             for the default register report, use 132 columns-        --head COUNT       show only the first COUNT entries (negative inverts)-        --tail COUNT       show only the last COUNT entries (negative inverts)-        --pager PAGER      send all output through the given PAGER program-    -A, --average          report average transaction amount-    -D, --deviation        report deviation from the average-    -%, --percentage       report balance totals as a percentile of the parent-        --totals           in the "xml" report, include running total-    -j, --amount-data      print only raw amount data (useful for scripting)-    -J, --total-data       print only raw total data-    -y, --date-format STR  use STR as the date format (default: %Y/%m/%d)-    -F, --format STR       use STR as the format; for each report type, use:-        --balance-format      --register-format       --print-format-        --plot-amount-format  --plot-total-format     --equity-format-        --prices-format       --wide-register-format-    -    Commodity reporting:-        --price-db FILE    sets the price database to FILE (def: ~/.pricedb)-    -L, --price-exp MINS   download quotes only if newer than MINS (def: 1440)-    -Q, --download         download price information when needed-    -O, --quantity         report commodity totals (this is the default)-    -V, --market           report last known market value-    -g, --performance      report gain/loss for each displayed transaction-    -G, --gain             report net gain/loss-    -    Commands:-    xml      [REGEXP]...   print matching entries in XML format-    equity   [REGEXP]...   output equity entries for matching accounts-    prices   [REGEXP]...   display price history for matching commodities-    entry DATE PAYEE AMT   output a derived entry, based on the arguments--#### Other differences---   hledger recognises description and negative patterns by "desc:"-    and "not:" prefixes, unlike ledger 3's free-form parser---   hledger doesn't require a space before command-line option-    values, eg either `-f-` or `-f -` is fine---   hledger's weekly reporting intervals always start on mondays---   hledger shows start and end dates of the intervals requested,-    not just the span containing data---   hledger period expressions don't support "biweekly",-    "bimonthly", or "every N days/weeks/..."---   hledger always shows timelog balances in hours---   hledger splits multi-day timelog sessions at midnight---   hledger doesn't track the value of commodities with varying-    price; prices are fixed as of the transaction date---   hledger print shows amounts for all postings, and shows unit-    prices for amounts which have them. (This currently means that-    it does not print multi-commodity transactions in valid journal format.)--### More examples and recipes---   Here's a bash function that will run hledger chart and display-    the image in your (graphical) emacs:--        function chart () {-          hledger chart $* && emacsclient -n hledger.png-        }--    Example:--        $ chart food --depth 2 -p jan--### Troubleshooting--#### Installation issues--cabal builds a lot of fast-evolving software, and it's not always smooth-sailing.  Here are some known issues and things to try:--- **Ask for help on [#hledger](irc://freenode.net/#hledger) or [#haskell](irc://freenode.net/#haskell).**-  Eg: join the #hledger channel with your IRC client and type: "sm: I did ... and ... happened", then leave-  that window open until you get helped.--- **Did you cabal update ?** If you didn't already, `cabal update` and try again.--- **Do you have a new enough version of GHC ?** hledger supports GHC 6.10-  and 6.12. Building with the `-fweb` flag requires 6.12 or greater.--- **An error while building non-hledger packages.**-  Resolve these problem packages one at a time. Eg, cabal install pkg1.-  Look for the cause of the failure near the end of the output. If it's-  not apparent, try again with `-v2` or `-v3` for more verbose output.--- **Could not run happy.**-  A package (eg haskell-src-exts) needs to run the `happy` executable.-  If not using the haskell platform, install the appropriate platform-  package which provides it (eg apt-get install happy).--- <a name="iconv" />**Undefined symbols: ... _iconv ...**-  If cabal gives this error:--        Linking dist/build/hledger/hledger ...-        Undefined symbols:-          "_iconv_close", referenced from:-              _hs_iconv_close in libHSbase-4.2.0.2.a(iconv.o)-          "_iconv", referenced from:-              _hs_iconv in libHSbase-4.2.0.2.a(iconv.o)-          "_iconv_open", referenced from:-              _hs_iconv_open in libHSbase-4.2.0.2.a(iconv.o)--    you are probably on a mac with macports libraries installed, causing-    [this issue](http://hackage.haskell.org/trac/ghc/ticket/4068).-    To work around temporarily, add this --extra-lib-dirs flag:--        $ cabal install hledger --extra-lib-dirs=/usr/lib--    or permanently, add this to ~/.cabal/config:-    -        extra-lib-dirs: /usr/lib--- **A ghc: panic! (the 'impossible' happened)** might be-    [this issue](http://hackage.haskell.org/trac/ghc/ticket/3862)--- **This package indirectly depends on multiple versions of the same package.**-  You may have previously installed some of hledger's dependencies-  depending on different versions of (eg) parsec. Then cabal install hledger gives-  an error like this:--        Warning: This package indirectly depends on multiple versions of the same-        package. This is highly likely to cause a compile failure.-        package yesod-0.5.0.3 requires parsec-2.1.0.1-        package csv-0.1.1 requires parsec-3.1.0-        ...--    The above example could be resolved by, eg:--        $ cabal install yesod --reinstall --constraint 'parsec == 3.1.0"--- **Another error while building a hledger package.**-    The current hledger release might have a coding error, or dependency-    error. You could try installing the-    [previous version](http://hackage.haskell.org/package/hledger):--        $ cabal install hledger-0.x--    or (preferably) the latest development version: install-    [darcs](http://darcs.net) and then:--        $ darcs get --lazy http://joyful.com/repos/hledger-        $ cd hledger/hledger-lib-        $ cabal install-        $ cd ..-        $ cabal install [-f...]--- **Do you have a new enough version of cabal-install ?**-  Recent versions tend to be better at resolving dependencies.  The error-  `setup: failed to parse output of 'ghc-pkg dump'` is another symptom of-  this.  To update, do:-  -        $ cabal update-        $ cabal install cabal-install-        $ cabal clean-        -    then try installing hledger again.--- **cabal fails to resolve dependencies.**-  It's possible for cabal to get confused, eg if you have-  installed/updated many cabal package versions or GHC itself. You can-  sometimes work around this by using cabal install's `--constraint`-  option. Another (drastic) way is to purge all unnecessary package-  versions by removing (or renaming) ~/.ghc, then trying cabal install-  again.--#### Usage issues--Here are some issues you might encounter when you run hledger:--- <a name="locale" />**hledger: ... hGetContents: invalid argument (Illegal byte sequence)**-  You may get this error when running hledger built with GHC 6.12 on a-  machine using the default C locale, eg a mac:-  -        $ locale-        LANG=-        LC_COLLATE="C"-        LC_CTYPE="C"-        LC_MESSAGES="C"-        LC_MONETARY="C"-        LC_NUMERIC="C"-        LC_TIME="C"-        LC_ALL=--    if there is non-ascii text in your journal file:--        $ file my.journal-        .../.journal: UTF-8 Unicode C++ program text-  -    In this case you need to set the `LANG` environment variable to a-    locale suitable for the encoding shown (probably UTF-8). You-    can set it temporarily when you run hledger:-  -        $ LANG=en_US.UTF-8 hledger ...-      -    or permanently:-  -        $ echo "export LANG=en_US.UTF-8" >>~/.bash_profile-        $ bash --login-

@@ -1,453 +0,0 @@-----title: hledger news------# hledger news--## 2010/9/6 hledger 0.12.1--  * web: fix account filtering breakage-  * installing: tighten up utf8-string dependency--## 2010/9/5 hledger 0.12--  * web: new, better web ui; accounts are now a permanent sidebar; add form uses auto-completing combo fields-  * installing: fix a build error with parsec 3 (#22)-  * installing: require exactly matching hledger-lib version for more robust builds-  * installing: explicit data-object dependency to ensure hledger and hledger-lib use the same time version-  * installing: explicit hamlet dependency for more robust building-  * installing: build threaded and with warnings-  * installing: drop -fweb610 flag-  * installing: add gtk2hs-buildtools dependency needed to build with -fchart-  * installing: require cabal 1.6 or greater-  * add -D/--daily flag-  * register: with --depth, clip account names or aggregate postings rather than excluding them-  * fix !include with deeply nested directories (#21)-  * fix obscured date parse errors with parsec 3-  * handle unicode better in errors-  * fix a ghc 6.12.3 error when running interpreted--Stats: 50 days and 90 commits since last release, now at 5741-lines of code with 136 tests and 41% unit test coverage.--## 2010/07/17 hledger 0.11.1--  * fix --version output--## 2010/07/17 hledger 0.11--  * split --help, adding --help-options and --help-all/-H, and make-    it the default command-  * use "journal" instead of "ledger file"; default suffix is-    .journal, default file is \~/.journal-  * auto-create missing journal files rather than giving an error-  * new format-detecting file reader (mixed journal transactions-    and timelog entries are no longer supported)-  * work around for first real-world rounding issue (test zero to 8-    decimal places instead of 10)-  * when reporting a balancing error, convert the error amount to-    cost-  * parsing: support double-quoted commodity symbols, containing-    anything but a newline or double quote-  * parsing: allow minus sign before commodity symbol as well as-    after (also fixes a convert bug)-  * parsing: fix wrong parse error locations within postings-  * parsing: don't let trailing whitespace in a timelog description-    mess up account names-  * add: allow blank descriptions-  * balance: --flat provides a simple non-hierarchical format-  * balance: --drop removes leading account name components from a-    --flat report-  * print, register, balance: fix layout issues with-    mixed-commodity amounts-  * print: display non-simple commodity names with double-quotes-  * stats: layout tweaks, add payee/description count-  * stats: don't break on an empty file-  * stats: -p/--period support; a reporting interval generates-    multiple reports-  * test: drop verbose test runner and testpack dependency-  * web: a new web ui based on yesod, requires ghc 6.12; old ghc-    6.10-compatible version remains as -fweb610-  * web: allow wiki-like journal editing-  * web: warn and keep running if reloading the journal gives an-    error-  * web: --port and --base-url options set the webserver's tcp port-    and base url-  * web: slightly better browser opening on microsoft windows,-    should find a standard firefox install now-  * web: in a web-enabled build on microsoft windows, run the web-    ui by default--Stats: 55 days and 136 commits since last release. Now at 5552-lines of code with 132 tests and 54% unit test coverage.--## 2010/05/23 hledger 0.10--  * fix too-loose testpack dependency, missing safe dependency-  * fix ghc 6.12 compatibility with -fweb-  * fix handling of non-ascii arguments with ghc 6.12-  * fix "0.8" in --version output-  * fix an occasional stack overflow error due to infinite-    recursion in Posting/Transaction equality tests-  * the -fwebhappstack build flag is gone for now, to avoid a cabal-    problem-  * parsing: if there is no description, don't require a space-    after the transaction date-  * parsing: balance balanced-virtual postings separately, allow-    them to have an implicit amount-  * parsing: timelog entries now generate balanced transactions,-    using virtual postings-  * parsing: simpler high-level parse error message-  * parsing: clearer bad date errors-  * add: fix wrongful program exit on bad dates-  * print: negative account patterns now exclude transactions-    containing any posting to a matched account-  * vty: rename the ui command to vty for consistency-  * vty: fix restricted account scope when backing up to top level-  * web: fix non-ascii handling with ghc 6.12-  * web: fix a bug possibly affecting reload-on-change-  * consolidate module namespace under Hledger, api cleanups--Stats: 44 days, 81 commits since last release. Now at 4904 lines of-code including tests, 144 tests, 53% coverage.--## 2010/04/10 hledger 0.9--  * ghc 6.12 support-  * split off hledger-lib package, containing core types & utils-  * parsing: ignore D, C, N, tag, end tag directives; we should now-    accept any ledger 2.6 file-  * parsing: allow numbers in commodities if double-quoted, like-    ledger-  * parsing: allow transactions with empty descriptions-  * parsing: show a better error for illegal month/day numbers in-    dates-  * parsing: don't ignore trailing junk in a smart date, eg in web-    add form-  * parsing: don't ignore unparsed text following an amount-  * parsing: @ was being treated as a currency symbol-  * add: fix precision handling in default amounts (\#19)-  * add: elide last amount in added transactions-  * convert: keep original description by default, allow-    backreferences in replace pattern-  * convert: basic csv file checking, warn instead of dying when it-    looks wrong-  * convert: allow blank/comment lines at end of rules file-  * print: always show zero amounts as 0, hiding any-    commodity/decimal places/price, like ledger-  * register: fix bad layout with years < 1000-  * register: fix a Prelude.head error with reporting interval,-    --empty, and --depth-  * register: fix a regression, register should not show posting-    comments-  * register: with --empty, intervals should continue to ends of-    the specified period-  * stats: better output when last transaction is in the future-  * stats: show commodity symbols, account tree depth, reorder-    slightly-  * web: -fweb now builds with simpleserver; to get happstack, use-    -fwebhappstack instead-  * web: pre-fill the add form with today's date-  * web: help links, better search form wording-  * web: show a proper error for a bad date in add form (\#17)-  * web: fix for unicode search form values-  * web: fix stack overflow caused by regexpr, and handle requests-    faster (\#14)-  * web: look for more-generic browser executables-  * web: more robust browser starting (\#6)-  * error message cleanups-  * more tests, refactoring, docs--Stats: 58 days, 2 contributors, 102 commits since last release. Now-at 3983 lines of non-test code, 139 tests, 53% coverage.--## 2010/02/11 hledger 0.8--  * parsing: in date=date2, use first date's year as a default for-    the second-  * add: ctrl-d doesn't work on windows, suggest ctrl-c instead-  * add: --no-new-accounts option disallows new accounts (Roman-    Cheplyaka)-  * add: re-use the previous transaction's date as default (Roman-    Cheplyaka)-  * add: a command-line argument now filters by account during-    history matching (Roman Cheplyaka)-  * chart: new command, generates balances pie chart (requires-    -fchart flag, gtk2hs) (Roman Cheplyaka, Simon Michael)-  * register: make reporting intervals honour a display expression-    (\#18)-  * web: fix help link-  * web: use today as default when adding with a blank date-  * web: re-enable account/period fields, they seem to be fixed,-    along with file re-reading (\#16)-  * web: get static files from the cabal data dir, or the current-    dir when using make (\#13)-  * web: preserve encoding during add, assuming it's utf-8 (\#15)-  * fix some non-utf8-aware file handling (\#15)-  * filter ledger again for each command, not just once at program-    start-  * refactoring, clearer data types--Stats: 62 days, 2 contributors, 76 commits since last release. Now-at 3464 lines of non-test code, 97 tests, 53% test coverage.--## 2009/12/11 hledger 0.7--  * price history support (first cut): P directives now work,-    though differently from c++ ledger. Each posting amount takes its-    fixed unit price from the price history (or-    @) when available. This is simple and useful for things like-    foreign currency expenses (but not investment tracking). Like-    ledger, balance and register don't show amount prices any more, and-    don't separate differently-priced amounts. Unlike ledger, print-    shows all amount prices, and supports -B.-  * --effective option, will use transactions' effective dates if-    any-  * convert: new rules file format, find/create rules file-    automatically, more robust parsing, more useful --debug output-  * print: always sort by date, fix long account name truncation,-    align amounts, show end of line comments, show all amounts for-    clarity (don't elide the final balancing amount)-  * ui: use vty 4, fixes non-ascii and gnome terminal problems-    (issues \#3, \#4)-  * web: allow data entry, react to data file changes, better-    layout, help links, remove histogram command and filter fields for-    now, fix bad localhost redirect, filter form did not work in eg-    firefox (issue \#7), reset link did not work in all browsers-  * parsing: require whitespace between date and status code, allow-    (and ignore) a time in price records, better error messages,-    non-zero exit code on parse failure-  * display non-ascii error messages properly (issue \#5)-  * fix an arithmetic bug that occasionally rejected valid-    transactions-  * fix a regex bug in showtree-  * don't break if HOME is undefined-  * --debug now implies --verbose-  * add functional tests like ledger's, use test-framework for-    speedy running, release shelltestrunner as a separate package-  * many hlint cleanups (Marko Kocić)-  * many site and documentation updates--Stats: 60 days, 1 contributor, 50 commits since last release. Now-at 3377 lines of non-test code, 97 tests, 53% test coverage.--## 2009/06/22 hledger 0.6.1--  * avoid use of exitSuccess which was breaking ghc 6.8/base 3-    compatibility (issue \#2)--## 2009/06/13 hledger 0.6--  * now cabal-installable on unix, mac, and windows, with Haskell-    Platform-  * provide experimental platform binaries-  * parsing: fix a silly failure to open ledger file paths-    containing \~-  * parsing: show better errors for unbalanced transaction and-    missing default year-  * parsing: allow parentheses and brackets inside account names,-    as ledger does-  * parsing: fail on empty account name components, don't just-    ignore-  * add: description passed as arguments now affects first-    transaction only-  * add: better handling of virtual postings and default amounts-  * print, register: show virtual accounts bracketed/parenthesised-  * web: improved web ui supporting full patterns & period-    expressions-  * new "stats" command reports some ledger statistics-  * many dev/doc/deployment infrastructure improvements-  * move website into darcs repo, update home page-  * move issue tracker to google code--Release stats:--  * Contributors: Simon Michael-  * Days since last release: 21-  * Commits: 94-  * Lines of non-test code: 2865-  * Tests: 82-  * Test coverage: 53% expressions-  * Known errors: 3 (inconsistent eliding, vty-related failures)-  * Performance: similar-    (http://hledger.org/profs/200906131120.bench)--## 2009/05/23 hledger 0.5.1--  * two fixes: really disable vty flag by default, and include-    ConvertCommand in cabal file--## 2009/05/23 hledger 0.5--  * the vty flag is disabled by default again, to ease installation-    on windows-  * use ledger 3 terminology: a ledger contains transactions which-    contain postings-  * new "add" command prompts for transactions interactively and-    adds them to the ledger-  * new "convert" command transforms bank CSV exports to ledger-    format, with rule-based cleanup-  * new "histogram" command shows transaction counts per day or-    other reporting interval-  * most commands now work properly with UTF8-encoded text (Sergey-    Astanin)-  * invoking as "hours" is now less different: it just uses your-    timelog, not your ledger-  * ..quarterly/-Q option summarises by quarter-  * ..uncleared/-U option looks only at uncleared transactions-  * be more accurate about checking balanced amounts, don't rely on-    display precision-  * enforce balancing for bracketed virtual postings-  * fix bug in eliding of posting amounts-  * don't show trailing spaces on amountless postings-  * parse null input as an empty ledger-  * don't treat comments as part of transaction descriptions-  * require some postings in ledger transactions-  * require a non-empty description in ledger transactions-  * don't fail when matching an empty pattern, as in "not:"-  * make the web server handle the null path-  * code, api and documentation updates-  * add a contributor agreement/list--Release stats:--  * Contributors: Simon Michael, Sergey Astanin-  * Days since last release: 51-  * Commits: 101-  * Lines of non-test code: 2795-  * Tests: 76-  * Known errors: 0--## 2009/04/03 hledger 0.4--  * new "web" command serves reports in a web browser (install with-    -f happs to build this)-  * make the vty-based curses ui a cabal build option, which will-    be ignored on MS windows-  * drop the ..options-anywhere flag, that is now the default-  * patterns now use not: and desc: prefixes instead of \^ and \^\^-  * patterns are now case-insensitive, like ledger-  * !include directives are now relative to the including file (Tim-    Docker)-  * "Y2009" default year directives are now supported, allowing m/d-    dates in ledger-  * individual transactions now have a cleared status-  * unbalanced entries now cause a proper warning-  * balance report now passes all ledger compatibility tests-  * balance report now shows subtotals by default, like ledger 3-  * balance report shows the final zero total when -E is used-  * balance report hides the final total when ..no-total is used-  * ..depth affects print and register reports (aggregating with a-    reporting interval, filtering otherwise)-  * register report sorts transactions by date-  * register report shows zero-amount transactions when -E is used-  * provide more convenient timelog querying when invoked as-    "hours"-  * multi-day timelog sessions are split at midnight-  * unterminated timelog sessions are now counted. Accurate time-    reports at last!-  * the test command gives better ..verbose output-  * ..version gives more detailed version numbers including-    patchlevel for dev builds-  * new make targets include: ghci, haddocktest, doctest, unittest,-    view-api-docs-  * a doctest-style framework for functional/shell tests has been-    added--Release stats:--  * Contributors: Simon Michael, Tim Docker; thanks to the HAppS,-    happstack and testpack developers-  * Days since release: 76-  * Commits: 144-  * Lines of non-test code: 2367-  * Tests: 56-  * Known errors: 0--## 2009/01/17 hledger 0.3--  * count timelog sessions on the day they end, like ledger, for-    now-  * when options are repeated, use the last instead of the first-  * builds with ghc 6.10 as well as 6.8-  * a simple ui for interactive report browsing: hledger ui-  * accept smart dates everywhere (YYYYMMDD, Y/M/D, Y, M/D, D, jan,-    today, last week etc.)-  * ..period/-p flag accepting period expressions like "in 2008",-    "weekly from last month"..-  * -W/-M/-Y convenience flags to summarise register weekly,-    monthly, yearly-  * ..depth and -E flags also affect summarised register reports-    (including depth=0)-  * ..display/-d flag supporting date predicates (like "d<[DATE]",-    "d\>=[DATE]")-  * !include directive to include additional ledger files-  * !account directive to set a default parent account-  * Added support for reading historical prices from files-  * timelog and ledger entries can be intermixed in one file-  * modifier and periodic entries can appear anywhere (but are-    still ignored)-  * help and readme improvements-  * runs much faster than 0.2--Release stats:--  * Contributors: Simon Michael, Nick Ingolia, Tim Docker; thanks-    to Corey O'Connor & the vty team-  * Lines of non-test code: 2123-  * Tests: 58-  * Known errors: 1--## 2008/11/23 hledger 0.2--  * fix balance report totals when filtering by account-  * fix balance report selection of accounts when filtering by-    account-  * fix a bug with account name eliding in balance report-  * if we happen to be showing a not-yet-auto-balanced entry, hide-    the AUTO marker-  * fix print command filtering by account-  * omit transactions with zero amount from register report-  * Fix bug in parsing of timelogs-  * rename ..showsubs to ..subtotal, like ledger-  * drop ..usage flag-  * don't require quickcheck-  * priced amounts (eg "10h @ $50") and ..basis/..cost/-B flag to-    show them with cost basis-  * easy ..depth option, equivalent to c++ ledger's -d 'l<=N'-  * smarter y/m/d date parsing for -b and -e (any number of digits,-    month and day default to 1, separator can be / - or .)-  * -n flag for balance command-  * ..empty/-E flag-  * build a library, as well as the exe-  * new home page url (http://joyful.com/hledger)-  * publish html and pdf versions of README-  * detect display preferences for each commodity like c++ ledger-  * support amounts with multiple currencies/commodities-  * support ..real/-R flag-  * support -C/..cleared flag to filter by entry status (not-    transaction status)-  * support virtual and balanced virtual transactions-  * parse comment lines beginning with a space, as from M-; in-    emacs ledger-mode-  * allow any non-whitespace in account names, perhaps avoiding-    misleading missing amounts errors-  * clearer error message when we can't balance an entry-  * when we fail because of more than one missing amount in an-    entry, show the full entry-  * document the built-in test runner in ..help-  * add a ..verbose/-v flag, use it to show more test-running-    detail--Release stats:--  * Contributors: Simon Michael, Tim Docker-  * Lines of non-test code: 1350-  * Tests: 43-  * Known errors: 0--## 2008/10/15 hledger 0.1--Release stats:--  * Contributors: Simon Michael

@@ -1,34 +0,0 @@-----title: hledger-----hledger-=======--hledger is a computer program for easily tracking money, time, or other-commodities, using standard accounting principles. It is quite limited in-features, but reliable.  For some, it is a bare-bones, less complex, less-expensive alternative to Quicken or Microsoft Money.-hledger is available for free under the GNU General Public License.--hledger aims to help both computer experts and every-day users gain clarity in their finances and time management.-I use it every day to: --- track spending and income-- see time reports by day/week/month/project-- get accurate numbers for client billing and tax filing-- track invoices--The manual_ and screenshots_ will explain more. There's also a demo_ of hledger's web interface.-To get started tracking your own numbers, download_ a copy.--For support and more technical info, see `development`_ or `email me`_.-I appreciate feedback on all aspects of hledger. Thanks!---.. _manual:        MANUAL.html-.. _screenshots:   SCREENSHOTS.html-.. _demo:          http://demo.hledger.org-.. _web interface: MANUAL.html#web-.. _download:      DOWNLOAD.html-.. _development:   DEVELOPMENT.html-.. _email me:      mailto:simon@joyful.com?subject=hledger:

@@ -1,40 +0,0 @@-; A sample journal file.-;-; Sets up this account tree:-; assets-;   bank-;     checking-;     saving-;   cash-; expenses-;   food-;   supplies-; income-;   gifts-;   salary-; liabilities-;   debts--2008/01/01 income-    assets:bank:checking  $1-    income:salary--2008/06/01 gift-    assets:bank:checking  $1-    income:gifts--2008/06/02 save-    assets:bank:saving  $1-    assets:bank:checking--2008/06/03 * eat & shop-    expenses:food      $1-    expenses:supplies  $1-    assets:cash--2008/12/31 * pay off-    liabilities:debts  $1-    assets:bank:checking---;final comment

@@ -1,17 +0,0 @@-base-account assets:bank:checking-date-field 0-description-field 4-amount-field 1-currency $--; account-assigning rules:--SPECTRUM-expenses:health:gym--ITUNES-BLKBSTR=BLOCKBUSTER-expenses:entertainment--(TO|FROM) SAVINGS-assets:bank:savings

@@ -1,6 +0,0 @@-i 2009/03/27 09:00:00 projects:a-o 2009/03/27 17:00:34-i 2009/03/31 22:21:45 personal:reading:online-o 2009/04/01 02:00:34-i 2009/04/02 09:00:00 projects:b-o 2009/04/02 17:00:34

@@ -1,1359 +0,0 @@-//v.2.6 build 100722--/*
-Copyright DHTMLX LTD. http://www.dhtmlx.com
-You allowed to use this component or parts of it under GPL terms
-To use it on other terms or get Professional edition of the component please contact us at sales@dhtmlx.com
-*/-
-/*_TOPICS_
-@0:Initialization
-@1:Selection control
-@2:Add/delete
-@3:Reserved
-@4:Methods of Option object
-*/
-
-/**
-*  Build combobox from existing select control.
-*
-*
-*  @param   parent      {string} id of existing select control
-*  @param   size      {int } size of control, optional
-*  @return            {object} combobox object
-*  @type   public
-*  @topic   0
-*
-*/
-
-function dhtmlXComboFromSelect(parent,size){
-   if (typeof(parent)=="string")
-      parent=document.getElementById(parent);
-   
-   
-   size=size||parent.getAttribute("width")||(window.getComputedStyle?window.getComputedStyle(parent,null)["width"]:(parent.currentStyle?parent.currentStyle["width"]:0));
-   if ((!size)||(size=="auto"))
-   		size=parent.offsetWidth||100;
-
-   var z=document.createElement("SPAN");
-   
-	
-  
-   parent.parentNode.insertBefore(z,parent);
-   parent.style.display='none';
-
-    var s_type = parent.getAttribute('opt_type');
-	
-   var w= new dhtmlXCombo(z,parent.name,size,s_type,parent.tabIndex);
-   
-   var x=new Array();
-   var sel=0;
-   for (var i=0; i<parent.options.length; i++){
-      if (parent.options[i].selected) sel=i;
-      var label=parent.options[i].innerHTML;
-      var val=parent.options[i].getAttribute("value");
-      if ((typeof(val)=="undefined")||(val===null)) val=label;
-      x[i]={value:val,text:label,img_src:parent.options[i].getAttribute("img_src")};
-   }
-    if(x.length)
-    w.addOption(x);
-   
-   
-	parent.parentNode.removeChild(parent);
-	w.selectOption(sel,null,true);
-	if (parent.onchange) 
-		w.attachEvent("onChange",parent.onchange);
-   		
-   	if(parent.style.direction=="rtl" && w.setRTL) 
-   		w.setRTL(true);
-   	
-   return w;
-}
-
-var dhtmlXCombo_optionTypes = [];
-/**
-*     @desc: build combobox
-*     @param: parent - (string) id of existing object which will be used as container
-*     @param: name - (string) name of combobox - will be used in FORM
-*     @param: width - (int) size of combobox
-*     @param: tabIndex - (int) tab index, optional
-*     @type: public
-*     @topic: 0
-*/
-function dhtmlXCombo(parent,name,width,optionType,tabIndex){
-      if (typeof(parent)=="string")
-         parent=document.getElementById(parent);
-
-      this.dhx_Event();
-      this.optionType = (optionType != window.undefined && dhtmlXCombo_optionTypes[optionType]) ? optionType : 'default';
-      this._optionObject = dhtmlXCombo_optionTypes[this.optionType];
-
-      this._disabled = false;
-	  
-	  if (!window.dhx_glbSelectAr){
-          window.dhx_glbSelectAr=new Array();
-          window.dhx_openedSelect=null;
-          window.dhx_SelectId=1;
-          dhtmlxEvent(document.body,"click",this.closeAll);
-          dhtmlxEvent(document.body,"keydown",function(e){ try { if ((e||event).keyCode==9)  window.dhx_glbSelectAr[0].closeAll(); } catch(e) {} return true; } );
-      }
-		
-     if (parent.tagName=="SELECT")
-         return dhtmlXComboFromSelect(parent);
-      else
-         this._createSelf(parent,name,width,tabIndex);
-      dhx_glbSelectAr.push(this);
-}
-
-/**
-*     @desc: change control size
-*     @param: new_size - (int) new size value
-*     @type: public
-*     @topic: 0
-*/
-   dhtmlXCombo.prototype.setSize = function(new_size){
-      this.DOMlist.style.width=new_size+"px";
-      if (this.DOMlistF) this.DOMlistF.style.width=new_size+"px";
-      this.DOMelem.style.width=new_size+"px";
-      this.DOMelem_input.style.width = Math.max(0,(new_size-19))+'px';
-   }      
-/**
-*     @desc: switch between combobox and auto-filter modes
-*     @param: mode - (boolean) enable filtering mode
-*     @param: url - (string) url for filtering from XML, optional
-*     @param: cache - (boolean) XML caching, optional
-*     @param: autosubload - (boolean) enable auto load additional suggestions on selecting last loaded option
-*     @type: public
-*     @topic: 0
-*/
-   dhtmlXCombo.prototype.enableFilteringMode = function(mode,url,cache,autosubload){
-      this._filter=convertStringToBoolean(mode);
-
-      if (url){
-         this._xml=url;
-         this._autoxml=convertStringToBoolean(autosubload);
-      }
-      if (convertStringToBoolean(cache)) this._xmlCache=[];
-      //this.DOMelem_button.style.display=(this._filter?"none":"");
-   }
-   
-   dhtmlXCombo.prototype.setFilteringParam=function(name,value){
-   		if (!this._prs) this._prs=[];
-   		this._prs.push([name,value]);
-   }
-/**
-*     @desc: disable combobox
-*     @param: mode - (boolean) disable combobox
-*     @type: public
-*     @topic: 1
-*/
-   dhtmlXCombo.prototype.disable = function(mode){
-      var z=convertStringToBoolean(mode);
-      if (this._disabled==z) return;
-      this.DOMelem_input.disabled=z;
-      this._disabled=z;
-   }
-/**
-*     @desc: switch to readonly mode
-*     @param: mode - (boolean) readonly mode
-*     @param: autosearch - (boolean) true by default 
-*     @type: public
-*     @topic: 1
-*/
-   dhtmlXCombo.prototype.readonly = function(mode,autosearch){
-        this.DOMelem_input.readOnly=mode ? true : false;
-		if(autosearch===false || mode===false){
-			this.DOMelem.onkeyup=function(ev){ }
-		} else {
-			var that = this;
-			this.DOMelem.onkeyup=function(ev){ 
-				ev=ev||window.event; 
-				if (ev.keyCode!=9) ev.cancelBubble=true;
-				if((ev.keyCode >= 48 && ev.keyCode <= 57)||(ev.keyCode >= 65 && ev.keyCode <= 90)){
-					for(var i=0; i<that.optionsArr.length; i++){
-						var text = that.optionsArr[i].text;
-						if(text.toString().toUpperCase().indexOf(String.fromCharCode(ev.keyCode)) == 0){
-								that.selectOption(i);
-								break;
-						}
-					}
-					ev.cancelBubble=true;
-				}
-			}
-		}
-	}	
-   
-/**
-*     @desc: get Option by value
-*     @param: value - (string) value of option in question
-*     @type: public
-*     @return: option object
-*     @topic: 2
-*/
-   dhtmlXCombo.prototype.getOption = function(value)
-   {
-      for(var i=0; i<this.optionsArr.length; i++)
-         if(this.optionsArr[i].value==value)
-            return this.optionsArr[i];
-      return null;
-   }
-/**
-*     @desc: get Option by label
-*     @param: label - (string) label of option in question
-*     @type: public
-*     @return: option object
-*     @topic: 2
-*/
-   dhtmlXCombo.prototype.getOptionByLabel = function(value)
-   {
-	  //value=value.replace(/&/g,"&amp;")
-      for(var i=0; i<this.optionsArr.length; i++)
-         if(this.optionsArr[i].text==value || this.optionsArr[i]._ctext==value)
-            return this.optionsArr[i];
-      return null;
-   }
-/**
-*     @desc: get Option by index
-*     @param: ind - (int) index of option in question
-*     @type: public
-*     @return: option object
-*     @topic: 2
-*/
-   dhtmlXCombo.prototype.getOptionByIndex = function(ind){
-      return this.optionsArr[ind];
-   }
-/**
-*     @desc: clear all options from combobox
-*     @type: public
-*     @param: value - (bool) clear current value as well
-*     @topic: 2
-*/
-   dhtmlXCombo.prototype.clearAll = function(all)
-   {
-	  if (all) this.setComboText("");   	  
-      this.optionsArr=new Array();
-      this.redrawOptions();
-      if (all) this._confirmSelection();
-   }
-/**
-*     @desc: delete option by value
-*     @param: value - (string) value of option in question
-*     @type: public
-*     @topic: 2
-*/
-   dhtmlXCombo.prototype.deleteOption = function(value)
-   {
-        var ind=this.getIndexByValue(value);
-      if(ind<0) return;                            
-      if (this.optionsArr[ind]==this._selOption) this._selOption=null;
-      this.optionsArr.splice(ind, 1);
-      this.redrawOptions();
-   }
-
-/**
-*     @desc: enable/disable immideatly rendering after changes in combobox
-*     @param: mode - (boolean) enable/disable
-*     @type: public
-*     @topic: 1
-*/
-   dhtmlXCombo.prototype.render=function(mode){
-      this._skiprender=(!convertStringToBoolean(mode));
-      this.redrawOptions();
-   }
-
-/**
-*     @desc: update option in combobox
-*     @param: oldvalue - (string) index of option in question
-*     @param: avalue - (variable)
-*     @type: public
-*     @topic: 2
-*/
-   dhtmlXCombo.prototype.updateOption = function(oldvalue, avalue, atext, acss)
-   {
-      var dOpt=this.getOption(oldvalue);
-      if (typeof(avalue)!="object") avalue={text:atext,value:avalue,css:acss};
-      dOpt.setValue(avalue);
-        this.redrawOptions();
-   }
-/**
-*     @desc: add new option
-*     @param: value - (variable) - different input for different kinds of options - please refer to examples
-*     @type: public
-*     @topic: 2
-*/
-   dhtmlXCombo.prototype.addOption = function(options)
-   {
-      if (!arguments[0].length || typeof(arguments[0])!="object")
-         args = [arguments];
-      else
-         args = options;
-
-      this.render(false);
-        for (var i=0; i<args.length; i++) {
-            var attr = args[i];
-         if (attr.length){
-               attr.value = attr[0]||"";
-               attr.text = attr[1]||"";
-               attr.css = attr[2]||"";
-         }
-            this._addOption(attr);
-        }
-      this.render(true);
-   }
-
-   dhtmlXCombo.prototype._addOption = function(attr)
-   {
-         dOpt = new this._optionObject();
-         this.optionsArr.push(dOpt);
-         dOpt.setValue.apply(dOpt,[attr]);
-         this.redrawOptions();
-   }
-
-
-/**
-*     @desc: return index of item by value
-*     @param: value - (string) value of option in question
-*     @type: public
-*     @return: option index
-*     @topic: 2
-*/
-   dhtmlXCombo.prototype.getIndexByValue = function(val){
-      for(var i=0; i<this.optionsArr.length; i++)
-         if(this.optionsArr[i].value == val) return i;
-      return -1;
-   }
-
-/**
-*     @desc: get value of selected item
-*     @type: public
-*     @return: option value
-*     @topic: 2 
-*/
-   dhtmlXCombo.prototype.getSelectedValue = function(){
-      return (this._selOption?this._selOption.value:null);
-   }
-/**
-*     @desc: get current text in combobox
-*     @type: public
-*     @return: combobox text
-*     @topic: 2
-*/
-   dhtmlXCombo.prototype.getComboText = function(){
-      return this.DOMelem_input.value;
-   }
-/**
-*     @desc: set text in covmbobox
-*     @param: text - (string) new text label
-*     @type: public
-*     @topic: 2
-*/
-   dhtmlXCombo.prototype.setComboText = function(text){
-      this.DOMelem_input.value=text;
-   }
-   
-/**
-*     @desc: set text in covmbobox
-*     @param: text - (string) new text label
-*     @type: public
-*     @topic: 2
-*/
-   dhtmlXCombo.prototype.setComboValue = function(text){
-      this.setComboText(text);
-	  for(var i=0; i<this.optionsArr.length; i++)
-         if (this.optionsArr[i].data()[0]==text)
-         return this.selectOption(i,null,true);      
-      this.DOMelem_hidden_input.value=text;
-   }
-
-/**
-*     @desc: get value which will be sent with form
-*     @type: public
-*     @return: combobox value
-*     @topic: 2
-*/
-   dhtmlXCombo.prototype.getActualValue = function(){
-      return this.DOMelem_hidden_input.value;
-   }
-/**
-*     @desc: get text of selected option
-*     @type: public
-*     @return: text of option
-*     @topic: 2
-*/
-   dhtmlXCombo.prototype.getSelectedText = function(){
-      return (this._selOption?this._selOption.text:"");
-   }
-/**
-*     @desc: get index of selected option
-*     @type: public
-*     @return: option index
-*     @topic: 2
-*/
-   dhtmlXCombo.prototype.getSelectedIndex = function(){
-      for(var i=0; i<this.optionsArr.length; i++)
-         if(this.optionsArr[i] == this._selOption) return i;
-      return -1;
-   }
-/**
-*     @desc: set name used while form submit
-*     @param: name - (string) new combobox name
-*     @type: public
-*     @topic: 2
-*/
-   dhtmlXCombo.prototype.setName = function(name){  
-        this.DOMelem_hidden_input.name = name;
-        this.DOMelem_hidden_input2 = name.replace(/(\]?)$/, "_new_value$1");
-
-        this.name = name;
-   }
-/**
-*     @desc: show combox ( reversion to hide command )
-*     @param: mode - (boolean) enable/disable
-*     @type: public
-*     @topic: 1
-*/
-   dhtmlXCombo.prototype.show = function(mode){
-      if (convertStringToBoolean(mode))
-         this.DOMelem.style.display = "";
-      else
-         this.DOMelem.style.display = "none";
-   }
-
-/**
-*     @desc: destroy object and any related HTML elements
-*     @type: public
-*     @topic: 0
-*/
-   dhtmlXCombo.prototype.destructor = function()
-   {
-      this.DOMParent.removeChild(this.DOMelem);
-      this.DOMlist.parentNode.removeChild(this.DOMlist);
-      var s=dhx_glbSelectAr;
-      this.DOMParent=this.DOMlist=this.DOMelem=0;
-      this.DOMlist.combo=this.DOMelem.combo=0;
-      for(var i=0; i<s.length; i++)
-      {
-         if(s[i] == this)
-         {
-            s[i] = null;
-            s.splice(i,1);
-            return;
-         }
-      }
-   }
-
-/**
-*     @desc: create self HTML
-*     @type: private
-*     @topic: 0
-*/
-      dhtmlXCombo.prototype._createSelf = function(selParent, name, width, tab)
-      {
-         if (width.toString().indexOf("%")!=-1){ 
-            var self = this;
-            var resWidht=parseInt(width)/100;
-            window.setInterval(function(){ 
-               if (!selParent.parentNode) return;
-               var ts=selParent.parentNode.offsetWidth*resWidht-2;
-               if (ts<0) return;
-               if (ts==self._lastTs) return;
-               self.setSize(self._lastTs=ts);},500);
-            var width=parseInt(selParent.offsetWidth); //mm
-         }
-
-         var width=parseInt(width||100); //mm
-         this.ListPosition = "Bottom"; //set optionlist positioning
-         this.DOMParent = selParent;
-         this._inID = null;
-         this.name = name;
-
-         this._selOption = null; //selected option object pointer
-         this.optionsArr = Array();
-
-            var opt = new this._optionObject();
-            opt.DrawHeader(this,name, width,tab);
-         //HTML select part 2 - options list DIV element
-         this.DOMlist = document.createElement("DIV");
-         this.DOMlist.className = 'dhx_combo_list '+(dhtmlx.skin?dhtmlx.skin+"_list":"");
-         this.DOMlist.style.width=width-(_isIE?0:0)+"px";
-		 if (_isOpera || _isKHTML ) 
-		 		this.DOMlist.style.overflow="auto";      
-         this.DOMlist.style.display = "none";
-         document.body.insertBefore(this.DOMlist,document.body.firstChild);         
-         if (_isIE)    {
-            this.DOMlistF = document.createElement("IFRAME");
-            this.DOMlistF.style.border="0px";
-            this.DOMlistF.className = 'dhx_combo_list';
-            this.DOMlistF.style.width=width-(_isIE?0:0)+"px";
-            this.DOMlistF.style.display = "none";
-            this.DOMlistF.src="javascript:false;"; 
-            document.body.insertBefore(this.DOMlistF,document.body.firstChild);
-            }
-
-
-
-         this.DOMlist.combo=this.DOMelem.combo=this;
-
-         this.DOMelem_input.onkeydown = this._onKey;
-          this.DOMelem_input.onkeypress = this._onKeyF;
-         this.DOMelem_input.onblur = this._onBlur;
-         this.DOMelem.onclick = this._toggleSelect;
-         this.DOMlist.onclick = this._selectOption;
-         this.DOMlist.onmousedown = function(){
-         	this._skipBlur=true;
-     	 }
-         
-         this.DOMlist.onkeydown = function(e){
-         	this.combo.DOMelem_input.focus();
-         	(e||event).cancelBubble=true;
-         	this.combo.DOMelem_input.onkeydown(e)
-     	 }
-		  this.DOMlist.onmouseover = this._listOver;
-     	 
-      }
-
-      dhtmlXCombo.prototype._listOver = function(e)
-      { 
-         e = e||event;
-         e.cancelBubble = true;
-         var node = (_isIE?event.srcElement:e.target);
-         var that = this.combo;
-         if ( node.parentNode == that.DOMlist ) {
-            if(that._selOption) that._selOption.deselect(); 
-			if(that._tempSel) that._tempSel.deselect();
-           
-		    var i=0;
-            for (i; i<that.DOMlist.childNodes.length; i++) {
-               if (that.DOMlist.childNodes[i]==node) break;
-            }
-            var z=that.optionsArr[i];
-           that._tempSel=z;
-           that._tempSel.select();
-        	  
-			if ((that._autoxml)&&((i+1)==that._lastLength)){
-				that._fetchOptions(i+1,that._lasttext||""); 
-            }           
-         }
-
-      }
-
-/**
-*     @desc: place option list in necessary place on screen
-*     @type: private
-*     @topic: 0
-*/
-      dhtmlXCombo.prototype._positList = function()
-      {
-	  	//if(this.ListAutoPosit) this.enableOptionAutoPositioning(true); //mm auto posit
-         var pos=this.getPosition(this.DOMelem);
-         if(this.ListPosition == 'Bottom'){
-            this.DOMlist.style.top = pos[1]+this.DOMelem.offsetHeight-1+"px";
-            this.DOMlist.style.left = pos[0]+"px";
-         }
-         else if(this.ListPosition == 'Top'){ //mm
-				this.DOMlist.style.top = pos[1] - this.DOMlist.offsetHeight+"px";
-            	
-				this.DOMlist.style.left = pos[0]+"px"; //mm
-          }
-		  else{
-			this.DOMlist.style.top = pos[1]+"px";
-            this.DOMlist.style.left = pos[0]+this.DOMelem.offsetWidth+"px";
-         }
-     
-      }
-	  
-	dhtmlXCombo.prototype.getPosition = function(oNode,pNode){
-		if (_isChrome){ 
-			if(!pNode)
-			var pNode = document.body
-			
-			var oCurrentNode=oNode;
-			var iLeft=0;
-			var iTop=0;
-			while ((oCurrentNode)&&(oCurrentNode!=pNode)){
-			iLeft+=oCurrentNode.offsetLeft-oCurrentNode.scrollLeft;
-			iTop+=oCurrentNode.offsetTop-oCurrentNode.scrollTop;
-			oCurrentNode=oCurrentNode.offsetParent;
-			}
-			if (pNode == document.body ){
-			if (_isIE && _isIE<8){
-			
-			if (document.documentElement.scrollTop)
-			iTop+=document.documentElement.scrollTop;
-			if (document.documentElement.scrollLeft)
-			iLeft+=document.documentElement.scrollLeft;
-			}
-			else
-			if (!_isFF){
-			iLeft+=document.body.offsetLeft;
-			iTop+=document.body.offsetTop;
-			}
-			}
-			return new Array(iLeft,iTop);
-		}
-		var pos = getOffset(oNode);
-        return [pos.left, pos.top];
-        
-	}
-/**
-*     @desc: correct current selection ( move it to first visible option )
-*     @type: private
-*     @topic: 2
-*/
-      dhtmlXCombo.prototype._correctSelection = function(){
-		 if (this.getComboText()!="")
-         for (var i=0; i<this.optionsArr.length; i++)
-            if (!this.optionsArr[i].isHidden()){
-               return this.selectOption(i,true,false);
-           }
-         this.unSelectOption();
-      }
-/**
-*     @desc: select next option in combobox
-*     @param: step - (int) step size
-*     @type: private
-*     @topic: 2
-*/
-      dhtmlXCombo.prototype.selectNext = function(step){
-         var z=this.getSelectedIndex()+step;
-         while (this.optionsArr[z]){
-            if (!this.optionsArr[z].isHidden())
-               return this.selectOption(z,false,false);
-            z+=step;
-         }
-      }
-/**
-*     @desc: on keypressed handler
-*     @type: private
-*     @topic: 0
-*/
-      dhtmlXCombo.prototype._onKeyF = function(e){
-         var that=this.parentNode.combo;
-         var ev=e||event;
-         ev.cancelBubble=true;
-         if (ev.keyCode=="13" || ev.keyCode=="9" ){
-         	that._confirmSelection();
-         	that.closeAll();
-     	} else
-        if (ev.keyCode=="27" ){
-         	that._resetSelection();
-         	that.closeAll();
-     	} else that._activeMode=true;
-         if (ev.keyCode=="13" || ev.keyCode=="27" ){ //enter
-            that.callEvent("onKeyPressed",[ev.keyCode])
-            return false;
-         }
-         return true;
-      }
-/**
-*     @desc: on keyup handler
-*     @type: private
-*     @topic: 0
-*/
-      dhtmlXCombo.prototype._onKey = function(e){
-         var that=this.parentNode.combo;
-         (e||event).cancelBubble=true;
-         var ev=(e||event).keyCode;
-         if (ev>15 && ev<19) return true; //shift,alt,ctrl
-        if (ev==27) return;
-        if ((that.DOMlist.style.display!="block")&&(ev!="13")&&(ev!="9")&&((!that._filter)||(that._filterAny)))
-            that.DOMelem.onclick(e||event);
-       
-		if ((ev!="13")&&(ev!="9")){
-         	window.setTimeout(function(){ that._onKeyB(ev); },1);
-         	if (ev=="40" || ev=="38")
-         		return false;
-     	}
-         else if (ev==9){
-         	that.closeAll();
-         	(e||event).cancelBubble=false;
-         }
-      }
-      dhtmlXCombo.prototype._onKeyB = function(ev)
-      {
-         if (ev=="40"){  //down
-            var z=this.selectNext(1);
-         } else if (ev=="38"){ //up
-            this.selectNext(-1);
-         } else{
-            this.callEvent("onKeyPressed",[ev])
-            if (this._filter) return this.filterSelf((ev==8)||(ev==46));
-            for(var i=0; i<this.optionsArr.length; i++)
-               if (this.optionsArr[i].data()[1]==this.DOMelem_input.value){
-//                  ev.cancelBubble=true;
-                  this.selectOption(i,false,false);
-                  return false;
-                  }
-            this.unSelectOption();
-         }
-         return true;
-      }
-
-
-/**
-*     @desc: on data change handler
-*     @type: private
-*     @topic: 0
-*/
-      dhtmlXCombo.prototype._onBlur = function()
-      {
-          var self = this.parentNode._self;
-          window.setTimeout(function(){
-          	if (self.DOMlist._skipBlur) return !(self.DOMlist._skipBlur=false);
-          	self._confirmSelection();        
-          	self.callEvent("onBlur",[]);
-          },100)
-          
-      }
-/**
-*     @desc: redraw combobox options
-*     @type: private
-*     @topic: 2
-*/
-      dhtmlXCombo.prototype.redrawOptions = function(){
-         if (this._skiprender) return;
-         for(var i=this.DOMlist.childNodes.length-1; i>=0; i--)
-            this.DOMlist.removeChild(this.DOMlist.childNodes[i]);
-         for(var i=0; i<this.optionsArr.length; i++)
-            this.DOMlist.appendChild(this.optionsArr[i].render());
-			
-		
-		
-						
-
-      }
-/**
-*     @desc: load list of options from XML
-*     @param: url - (string) xml url
-*     @type: public
-*     @topic: 0
-*/
-      dhtmlXCombo.prototype.loadXML = function(url,afterCall){
-         this._load=true;
-         this.callEvent("onXLS",[]);
-		 if (this._prs)
-           	for (var i=0; i<this._prs.length; i++)
-           		url+=[getUrlSymbol(url),escape(this._prs[i][0]),"=",escape(this._prs[i][1])].join("");         
-         if ((this._xmlCache)&&(this._xmlCache[url])){
-            this._fillFromXML(this,null,null,null,this._xmlCache[url]);
-            if (afterCall) afterCall();
-        }
-         else{
-            var xml=(new dtmlXMLLoaderObject(this._fillFromXML,this,true,true));
-            if (afterCall) xml.waitCall=afterCall;
-            xml._cPath=url;
-            xml.loadXML(url);
-         }
-      }
-
-/**
-*     @desc: load list of options from XML string
-*     @param: astring - (string) xml string
-*     @type: public
-*     @topic: 0
-*/
-      dhtmlXCombo.prototype.loadXMLString = function(astring){
-         var xml=(new dtmlXMLLoaderObject(this._fillFromXML,this,true,true));
-         xml.loadXMLString(astring);
-      }
-
-/**
-*     @desc: on XML load handler
-*     @type: private
-*     @topic: 0
-*/
-      dhtmlXCombo.prototype._fillFromXML = function(obj,b,c,d,xml){
-         if (obj._xmlCache) obj._xmlCache[xml._cPath]=xml;
-
-         //check that XML is correct 
-         var toptag=xml.getXMLTopNode("complete");
-         if (toptag.tagName!="complete") return;
-         var top=xml.doXPath("//complete");
-         var options=xml.doXPath("//option");
-         
-         var add = false;
-         
-         obj.render(false);
-         if ((!top[0])||(!top[0].getAttribute("add"))){
-            obj.clearAll();
-            obj._lastLength=options.length;
-	         if (obj._xml){
-	         if ((!options) || (!options.length)) 
-	         	obj.closeAll();
-	         else {
-	         		if (obj._activeMode){
-	         			obj._positList();
-	        			obj.DOMlist.style.display="block";
-	         			if (_isIE) obj._IEFix(true);
-         			}
-	     	 }}            
-         } else {
-            obj._lastLength+=options.length||Infinity;
-	        add = true;
-        }
-
-         for (var i=0; i<options.length; i++) {
-            var attr = new Object();
-            attr.text = options[i].firstChild?options[i].firstChild.nodeValue:"";
-            for (var j=0; j<options[i].attributes.length; j++) {
-               var a = options[i].attributes[j];
-               if (a)
-                  attr[a.nodeName] = a.nodeValue;
-            }
-            obj._addOption(attr);
-         }
-         obj.render(add!=true || (!!options.length));
-         	
-         if ((obj._load)&&(obj._load!==true))
-            obj.loadXML(obj._load);
-         else{
-            obj._load=false;
-             if ((!obj._lkmode)&&(obj._filter))
-               obj._correctSelection();
-            }
-
-         var selected=xml.doXPath("//option[@selected]");
-         if (selected.length)
-         	obj.selectOption(obj.getIndexByValue(selected[0].getAttribute("value")),false,true);
-
-         obj.callEvent("onXLE",[]);
-
-      }
-/**
-*     @desc: deselect option
-*     @type: public
-*     @topic: 1
-*/
-      dhtmlXCombo.prototype.unSelectOption = function(){
-         if (this._selOption) this._selOption.deselect();
-         if(this._tempSel) this._tempSel.deselect();
-         this._tempSel=this._selOption=null;
-      }
-	  
-/**
-*     @desc: confirms combo value (recommended to be called on form submit)
-*     @type: public
-*     @topic: 1
-*/
-	 dhtmlXCombo.prototype.confirmValue = function(){
-         this._confirmSelection();
-	 }
-	  
-	  
-      dhtmlXCombo.prototype._confirmSelection = function(data,status){
-      	if(arguments.length==0){
-      	    var z=this.getOptionByLabel(this.DOMelem_input.value);
-          	data = z?z.value:this.DOMelem_input.value;
-          	status = (z==null);
-          	if (data==this.getActualValue()) return;
-      	}
-          	
-      	this.DOMelem_hidden_input.value=data;
-        this.DOMelem_hidden_input2.value = (status?"true":"false");
-      	this.callEvent("onChange",[]);
-      	this._activeMode=false;
-  	  }
-      dhtmlXCombo.prototype._resetSelection = function(data,status){
-      		var z=this.getOption(this.DOMelem_hidden_input.value);
-      		this.setComboValue(z?z.data()[0]:this.DOMelem_hidden_input.value)
-      		this.setComboText(z?z.data()[1]:this.DOMelem_hidden_input.value)
-  	  }  	  
-  	  
-/**
-*     @desc: select option
-*     @param: ind - (int) index of option in question
-*     @param: filter - (boolean) enable autocomplit range, optional
-*     @param: conf - (boolean) true for real selection, false for pre-selection
-*     @type: public
-*     @topic: 1
-*/
-      dhtmlXCombo.prototype.selectOption = function(ind,filter,conf){
-      	 if (arguments.length<3) conf=true;
-         this.unSelectOption();
-         var z=this.optionsArr[ind];
-         if (!z)  return;
-         this._selOption=z;
-         this._selOption.select();
-
-         var corr=this._selOption.content.offsetTop+this._selOption.content.offsetHeight-this.DOMlist.scrollTop-this.DOMlist.offsetHeight;
-         if (corr>0) this.DOMlist.scrollTop+=corr;
-            corr=this.DOMlist.scrollTop-this._selOption.content.offsetTop;
-         if (corr>0) this.DOMlist.scrollTop-=corr;
-         var data=this._selOption.data();
-
-	 	 if (conf){
-	 	 	this.setComboText(data[1]);
-	 	 	this._confirmSelection(data[0],false);
-		 
-         	if ((this._autoxml)&&((ind+1)==this._lastLength))
-            	this._fetchOptions(ind+1,this._lasttext||"");
-		}
-
-         if (filter){
-            var text=this.getComboText();
-            if (text!=data[1]){
-               this.setComboText(data[1]);
-               dhtmlXRange(this.DOMelem_input,text.length+1,data[1].length);
-            }
-         }
-         else
-            this.setComboText(data[1]);
-         this._selOption.RedrawHeader(this);
-
-         /*Event*/
-         this.callEvent("onSelectionChange",[]);
-      }
-/**
-*     @desc: option on select handler
-*     @type: private
-*     @topic: 2
-*/
-      dhtmlXCombo.prototype._selectOption = function(e)
-      {
-         (e||event).cancelBubble = true;
-         var node=(_isIE?event.srcElement:e.target);
-         var that=this.combo;
-         while (!node._self) {
-            node = node.parentNode;
-            if (!node)
-               return;
-         }
-
-         var i=0;
-         for (i; i<that.DOMlist.childNodes.length; i++) {
-            if (that.DOMlist.childNodes[i]==node) break;
-         }
-         that.selectOption(i,false,true);
-         that.closeAll();
-         that.callEvent("onBlur",[])
-         that._activeMode=false;
-      }
-/**
-*     @desc: open list of options 
-*     @type: public
-*     @topic: 2
-*/
-   dhtmlXCombo.prototype.openSelect = function(){ 
-   	
-	
-    
-	  if (this._disabled) return;
-      this.closeAll();
-      this._positList();
-      this.DOMlist.style.display="block";
-      this.callEvent("onOpen",[]);
-	  if(this._tempSel) this._tempSel.deselect();
-	  if(this._selOption) this._selOption.select();
-	  if(this._selOption){
-	 	var corr=this._selOption.content.offsetTop+this._selOption.content.offsetHeight-this.DOMlist.scrollTop-this.DOMlist.offsetHeight;
-         if (corr>0) this.DOMlist.scrollTop+=corr;
-            corr=this.DOMlist.scrollTop-this._selOption.content.offsetTop;
-         if (corr>0) this.DOMlist.scrollTop-=corr;
-	  }
-	  /* if (this.autoOptionSize){
-        	var x=this.DOMlist.offsetWidth; 
-			
-        	for ( var i=0; i<this.optionsArr.length; i++){
-				if(i==0) alert("this.DOMlist.childNodes[i].scrollWidth ="+ this.DOMlist.childNodes[i].scrollWidth + "> x= "+ x);
-        		if (this.DOMlist.childNodes[i].scrollWidth > x)
-        			x=this.DOMlist.childNodes[i].scrollWidth;
-			}
-        			
-			this.DOMlist.style.width=x+"px";
-		}*/
-		
-		      
-      if (_isIE) this._IEFix(true);
-      this.DOMelem_input.focus();
-	
-      if (this._filter) this.filterSelf();
-   }
-/**
-*     @desc: open(close) list
-*     @type: private
-*     @topic: 2
-*/
-   dhtmlXCombo.prototype._toggleSelect = function(e)
-   {
-      var that=this.combo;
-      if ( that.DOMlist.style.display == "block" ) {
-      that.closeAll();
-      } else {
-         that.openSelect();
-      }
-      (e||event).cancelBubble = true;
-   }
-
-    dhtmlXCombo.prototype._fetchOptions=function(ind,text){
-         if (text=="") { this.closeAll();  return this.clearAll();   }
-         var url=this._xml+((this._xml.indexOf("?")!=-1)?"&":"?")+"pos="+ind+"&mask="+encodeURIComponent(text);
-         this._lasttext=text;
-         if (this._load) this._load=url;
-         else {
-			if (!this.callEvent("onDynXLS",[text,ind])) return;
-			this.loadXML(url);
-     	 }
-    }
-/**
-*     @desc: filter list of options
-*     @type: private
-*     @topic: 2
-*/
-    dhtmlXCombo.prototype.filterSelf = function(mode)
-   {
-      var text=this.getComboText();
-      if (this._xml){
-         this._lkmode=mode;
-         this._fetchOptions(0,text);
-      }
-      try{ var filter=new RegExp("^"+text,"i"); } catch (e){ var filter=new RegExp("^"+text.replace(/([\[\]\{\}\(\)\+\*\\])/g,"\\$1")); }
-      this.filterAny=false;
-      for(var i=0; i<this.optionsArr.length; i++){
-      	 var z=filter.test(this.optionsArr[i].text);
-      	 this.filterAny|=z;
-         this.optionsArr[i].hide(!z);
-      }
-      if (!this.filterAny) {
-		  this.closeAll();
-		  this._activeMode=true;
-	  }
-      else {
-      	  if (this.DOMlist.style.display!="block")
-      	   		this.openSelect();
-	      if (_isIE) this._IEFix(true);
-  		}
-         
-        if (!mode)
-         this._correctSelection();   
-        else this.unSelectOption();
-   }
- 
- 
-
-
-/**
-*     @desc: set hidden iframe for IE
-*     @type: private
-*     @topic: 2
-*/
-   dhtmlXCombo.prototype._IEFix = function(mode){
-      this.DOMlistF.style.display=(mode?"block":"none");
-        this.DOMlistF.style.top=this.DOMlist.style.top;
-        this.DOMlistF.style.left=this.DOMlist.style.left;
-   }
-/**
-*     @desc: close opened combobox list
-*     @type: public
-*     @topic: 1
-*/
-   dhtmlXCombo.prototype.closeAll = function()
-   {
-      if(window.dhx_glbSelectAr)
-         for (var i=0; i<dhx_glbSelectAr.length; i++){
-            if (dhx_glbSelectAr[i].DOMlist.style.display=="block") {
-               dhx_glbSelectAr[i].DOMlist.style.display = "none";
-               if (_isIE) dhx_glbSelectAr[i]._IEFix(false);
-            }
-            dhx_glbSelectAr[i]._activeMode=false;
-        }
-   }
- 
-		
-/**
-*     @desc: create selection range in input control
-*     @param: InputId - (string) id of input ( object can be used as well )
-*     @param: Start - (int) start selection position
-*     @param: End - (int) end selection position
-*     @type: public
-*     @topic: 0
-*/
-function dhtmlXRange(InputId, Start, End)
-{
-   var Input = typeof(InputId)=='object' ? InputId : document.getElementById(InputId);
-   try{    Input.focus();   } catch(e){};
-   var Length = Input.value.length;
-   Start--;
-   if (Start < 0 || Start > End || Start > Length)
-      Start = 0;
-   if (End > Length)
-      End = Length;
-   if (Start==End) return;
-   if (Input.setSelectionRange) {
-      Input.setSelectionRange(Start, End);
-   } else if (Input.createTextRange) {
-      var range = Input.createTextRange();
-      range.moveStart('character', Start);
-      range.moveEnd('character', End-Length);
-	  try{
-         range.select();
-	  }
-	  catch(e){
-	  }
-   }
-}
-/**
-*     @desc: combobox option object constructor
-*     @type: public
-*     @topic: 0
-*/
-      dhtmlXCombo_defaultOption = function(){
-         this.init();
-      }
-/**
-*     @desc: option initialization function
-*     @type: private
-*     @topic: 4
-*/
-      dhtmlXCombo_defaultOption.prototype.init = function(){
-         this.value = null;
-         this.text = "";
-         this.selected = false;
-         this.css = "";
-      }
-/**
-*     @desc: mark option as selected
-*     @type: public
-*     @topic: 4
-*/
-      dhtmlXCombo_defaultOption.prototype.select = function(){
-         if (this.content){
-            this.content.className="dhx_selected_option"+(dhtmlx.skin?" combo_"+dhtmlx.skin+"_sel":"");
-		}
-      }
-/**
-*     @desc: hide option
-*     @param: mode - (boolean)
-*     @type: public
-*     @topic: 4
-*/
-      dhtmlXCombo_defaultOption.prototype.hide = function(mode){
-         this.render().style.display=mode?"none":"";
-      }
-/**
-*     @desc: return hide state of option
-*     @type: public
-*     @return: hide state of option
-*     @topic: 4
-*/
-      dhtmlXCombo_defaultOption.prototype.isHidden = function(){
-         return (this.render().style.display=="none");
-      }
-/**
-*     @desc: mark option as not selected
-*     @type: public
-*     @topic: 4
-*/
-      dhtmlXCombo_defaultOption.prototype.deselect = function(){
-         if (this.content) this.render();
-            this.content.className="";
-      }
-/**
-*     @desc: set value of option
-*     @param: value - (string) value
-*     @param: text - (string) text
-*     @param: css - (string) css style string
-*     @type: public
-*     @topic: 4
-*/
-dhtmlXCombo_defaultOption.prototype.setValue = function(attr){
-    this.value = attr.value||"";
-    this.text = attr.text||"";
-    this.css = attr.css||"";
-   this.content=null;
-}
-
-				
-/**
-*     @desc: render option
-*     @type: private
-*     @topic: 4
-*/
-      dhtmlXCombo_defaultOption.prototype.render = function(){
-         if (!this.content){
-            this.content=document.createElement("DIV");
-        this.content._self = this;
-
-            this.content.style.cssText='width:100%; overflow:hidden;'+this.css;
-            if (_isOpera || _isKHTML ) this.content.style.padding="2px 0px 2px 0px";
-            this.content.innerHTML=this.text;
-            this._ctext=_isIE?this.content.innerText:this.content.textContent;
-         }
-         return this.content;
-      }
-/**
-*     @desc: return option data
-*     @type: public
-*     @return: array of data related to option
-*     @topic: 4
-*/
-      dhtmlXCombo_defaultOption.prototype.data = function(){
-         if (this.content)
-            return [this.value,this._ctext ? this._ctext : this.text];
-      }
-
-dhtmlXCombo_defaultOption.prototype.DrawHeader = function(self, name, width, tab)
-{
-    var z=document.createElement("DIV");
-    z.style.width = width+"px";
-    z.className = 'dhx_combo_box '+(dhtmlx.skin||"");
-    z._self = self;
-	self.DOMelem = z;
-   	this._DrawHeaderInput(self, name, width,tab);
-	this._DrawHeaderButton(self, name, width);
-    self.DOMParent.appendChild(self.DOMelem);
-}
-
-dhtmlXCombo_defaultOption.prototype._DrawHeaderInput = function(self, name, width,tab)
-{
-
-	var z=document.createElement('input');
-	z.setAttribute("autocomplete","off"); 
-	z.type = 'text';
-	z.className = 'dhx_combo_input';
-
-   if (tab) z.tabIndex=tab;
-   z.style.width = width-19-(document.compatMode=="BackCompat"?0:3)+'px';
-   self.DOMelem.appendChild(z);
-   self.DOMelem_input = z;
-
-   z = document.createElement('input');
-   z.type = 'hidden';
-   z.name = name;
-   self.DOMelem.appendChild(z);
-   self.DOMelem_hidden_input = z;
-
-   z = document.createElement('input');
-   z.type = 'hidden';
-   z.name = (name||"").replace(/(\]?)$/, "_new_value$1");
-   z.value="true";
-   self.DOMelem.appendChild(z);
-   self.DOMelem_hidden_input2 = z;
-}
-
-dhtmlXCombo_defaultOption.prototype._DrawHeaderButton = function(self, name, width)
-{
-   var z=document.createElement('img');
-   z.className = 'dhx_combo_img';
-  if(dhtmlx.image_path) dhx_globalImgPath = dhtmlx.image_path;
-   z.src = (window.dhx_globalImgPath?dhx_globalImgPath:"")+'combo_select'+(dhtmlx.skin?"_"+dhtmlx.skin:"")+'.gif';
-   self.DOMelem.appendChild(z);
-   self.DOMelem_button=z;
-}
-
-dhtmlXCombo_defaultOption.prototype.RedrawHeader = function(self)
-{
-}
-
-
-dhtmlXCombo_optionTypes['default'] = dhtmlXCombo_defaultOption;
-
-dhtmlXCombo.prototype.dhx_Event=function()
-{
-   this.dhx_SeverCatcherPath="";
-
-   this.attachEvent = function(original, catcher, CallObj)
-   {
-      CallObj = CallObj||this;
-      original = 'ev_'+original;
-       if ( ( !this[original] ) || ( !this[original].addEvent ) ) {
-           var z = new this.eventCatcher(CallObj);
-           z.addEvent( this[original] );
-           this[original] = z;
-       }
-       return ( original + ':' + this[original].addEvent(catcher) );   //return ID (event name & event ID)
-   }
-   this.callEvent=function(name,arg0){
-         if (this["ev_"+name]) return this["ev_"+name].apply(this,arg0);
-       return true;
-   }
-   this.checkEvent=function(name){
-         if (this["ev_"+name]) return true;
-       return false;
-   }
-
-   this.eventCatcher = function(obj)
-   {
-       var dhx_catch = new Array();
-       var m_obj = obj;
-       var func_server = function(catcher,rpc)
-                         {
-                           catcher = catcher.split(":");
-                     var postVar="";
-                     var postVar2="";
-                           var target=catcher[1];
-                     if (catcher[1]=="rpc"){
-                           postVar='<?xml version="1.0"?><methodCall><methodName>'+catcher[2]+'</methodName><params>';
-                        postVar2="</params></methodCall>";
-                        target=rpc;
-                     }
-                           var z = function() {
-                                   }
-                           return z;
-                         }
-       var z = function()
-             {
-                   if (dhx_catch)
-                      var res=true;
-                   for (var i=0; i<dhx_catch.length; i++) {
-                      if (dhx_catch[i] != null) {
-                           var zr = dhx_catch[i].apply( m_obj, arguments );
-                           res = res && zr;
-                      }
-                   }
-                   return res;
-                }
-       z.addEvent = function(ev)
-                {
-                       if ( typeof(ev) != "function" )
-                           if (ev && ev.indexOf && ev.indexOf("server:") == 0)
-                               ev = new func_server(ev,m_obj.rpcServer);
-                           else
-                               ev = eval(ev);
-                       if (ev)
-                           return dhx_catch.push( ev ) - 1;
-                       return false;
-                }
-       z.removeEvent = function(id)
-                   {
-                     dhx_catch[id] = null;
-                   }
-       return z;
-   }
-
-   this.detachEvent = function(id)
-   {
-      if (id != false) {
-         var list = id.split(':');            //get EventName and ID
-         this[ list[0] ].removeEvent( list[1] );   //remove event
-      }
-   }
-};
-
-
-//combo
-(function(){
-	dhtmlx.extend_api("dhtmlXCombo",{
-		_init:function(obj){
-			if (obj.image_path) 
-				dhx_globalImgPath=obj.image_path;
-			return [obj.parent, obj.name, (obj.width||"100%"), obj.type, obj.index ];
-		},
-		filter:"filter_command",
-		auto_height:"enableOptionAutoHeight",
-		auto_position:"enableOptionAutoPositioning",
-		auto_width:"enableOptionAutoWidth",
-		xml:"loadXML",
-		readonly:"readonly",
-		items:"addOption"
-	},{
-		filter_command:function(data){
-			if (typeof data == "string")
-				this.enableFilteringMode(true,data);
-			else
-				this.enableFilteringMode(data);
-		}
-	});
-})();
-
-
-//(c)dhtmlx ltd. www.dhtmlx.com