sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve ledger-split-commodities to handle multi character commodities.

Browse source
This commit is contained in:
Craig Earls 2013-03-24 17:20:36 -04:00
parent 9079ae8a69
commit 0d0e996e07
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lisp/ldg-commodities.el
View file

@ -32,7 +32,7 @@
:group 'ledger-reconcile) :group 'ledger-reconcile)
(defun ledger-split-commodity-string (str) (defun ledger-split-commodity-string (str)
"Split a commoditized amount into two parts" "Split a commoditized amount into two parts"
(if (> (length str) 0) (if (> (length str) 0)
(let (val comm number-regex) (let (val comm number-regex)
(with-temp-buffer (with-temp-buffer
@ -48,18 +48,16 @@
(ledger-commodity-string-number-decimalize (ledger-commodity-string-number-decimalize
(delete-and-extract-region (match-beginning 0) (match-end 0)) :from-user))) (delete-and-extract-region (match-beginning 0) (match-end 0)) :from-user)))
(goto-char (point-min)) (goto-char (point-min))
(re-search-forward "[^[:space:]]" nil t) (setq comm (nth 0 (split-string (buffer-substring (point-min) (point-max)))))
(setq comm
(delete-and-extract-region (match-beginning 0) (match-end 0)))
(list val comm)) (list val comm))
((re-search-forward "0" nil t) ((re-search-forward "0" nil t)
;; couldn't find a decimal number, look for a single 0, ;; couldn't find a decimal number, look for a single 0,
;; indicating account with zero balance ;; indicating account with zero balance
(list 0 ledger-reconcile-default-commodity)) (list 0 ledger-reconcile-default-commodity))
(t )))
(error "split-commodity-string: cannot parse commodity string: %S" str)))))
(list 0 ledger-reconcile-default-commodity)))
;; nothing found, return 0
(list 0 ledger-reconcile-default-commodity)))
(defun ledger-string-balance-to-commoditized-amount (str) (defun ledger-string-balance-to-commoditized-amount (str)
"Return a commoditized amount (val, 'comm') from STR." "Return a commoditized amount (val, 'comm') from STR."