IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-20 11:48:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

QIF Import: Remove the changes for bug #141003 but leave the fix to bug #141002 intact. A reworked fix for bug #141003 will be committed separately.

Browse Source 
BP


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17598 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Charles Day 2008-09-26 23:32:07 +00:00
parent f9fe85f6e2
commit 6c0dc2d7fc
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/import-export/qif-import/qif-file.scm
View File

@ -287,8 +287,7 @@
(qif-split:set-memo! current-split value)))
;; $ : split amount (if there are splits)
;; Also allowing pound symbol just in case (#141003)
((#\$ #\243)
((#\$)
(if (and current-split
(not-bad-numeric-string? value))
(qif-split:set-amount! current-split value)))

2
src/import-export/qif-import/qif-objects.scm
View File

@ -177,7 +177,7 @@
;; [Y] name of security
;; [O] commission (parsed)
;; [L] category : string
;; [S]/[E]/[$]/[pound ("\xa3" or #\243)] splits : a list of <qif-split>
;; [S]/[E]/[$] splits : a list of <qif-split>
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define <qif-xtn>

8
src/import-export/qif-import/qif-parse.scm
View File

@ -19,13 +19,13 @@
(define decimal-radix-regexp
(make-regexp
"^ *[$\xa3]?[+-]?[$\xa3]?[0-9]+[+-]?$|^ *[$\xa3]?[+-]?[$\xa3]?[0-9]?[0-9]?[0-9]?([,'][0-9][0-9][0-9])*(\\.[0-9]*)?[+-]? *$|^ *[$\xa3]?[+-]?[$\xa3]?[0-9]+\\.[0-9]*[+-]? *$"))
"^ *[$]?[+-]?[$]?[0-9]+[+-]?$|^ *[$]?[+-]?[$]?[0-9]?[0-9]?[0-9]?([,'][0-9][0-9][0-9])*(\\.[0-9]*)?[+-]? *$|^ *[$]?[+-]?[$]?[0-9]+\\.[0-9]*[+-]? *$"))
(define comma-radix-regexp
(make-regexp
"^ *[$\xa3]?[+-]?[$\xa3]?[0-9]+[+-]?$|^ *[$\xa3]?[+-]?[$\xa3]?[0-9]?[0-9]?[0-9]?([\\.'][0-9][0-9][0-9])*(,[0-9]*)?[+-]? *$|^ *[$\xa3]?[+-]?[$\xa3]?[0-9]+,[0-9]*[+-]? *$"))
"^ *[$]?[+-]?[$]?[0-9]+[+-]?$|^ *[$]?[+-]?[$]?[0-9]?[0-9]?[0-9]?([\\.'][0-9][0-9][0-9])*(,[0-9]*)?[+-]? *$|^ *[$]?[+-]?[$]?[0-9]+,[0-9]*[+-]? *$"))
(define integer-regexp (make-regexp "^[$\xa3]?[+-]?[$\xa3]?[0-9]+[+-]? *$"))
(define integer-regexp (make-regexp "^[$]?[+-]?[$]?[0-9]+[+-]? *$"))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; qif-split:parse-category
@ -548,7 +548,7 @@
(define (qif-parse:parse-number/format value-string format)
(let ((minus-index (string-index value-string #\-))
(filtered-string (gnc:string-delete-chars value-string "$\xa3'+-")))
(filtered-string (gnc:string-delete-chars value-string "$'+-")))
(case format
((decimal)
(let* ((read-string (string-remove-char filtered-string #\,))