diff --git a/src/import-export/qif-import/qif-file.scm b/src/import-export/qif-import/qif-file.scm index b316cbf5ae..d2ea73c819 100644 --- a/src/import-export/qif-import/qif-file.scm +++ b/src/import-export/qif-import/qif-file.scm @@ -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))) diff --git a/src/import-export/qif-import/qif-objects.scm b/src/import-export/qif-import/qif-objects.scm index 3658db6cae..933bd51680 100644 --- a/src/import-export/qif-import/qif-objects.scm +++ b/src/import-export/qif-import/qif-objects.scm @@ -177,7 +177,7 @@ ;; [Y] name of security ;; [O] commission (parsed) ;; [L] category : string -;; [S]/[E]/[$]/[pound ("\xa3" or #\243)] splits : a list of +;; [S]/[E]/[$] splits : a list of ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (define diff --git a/src/import-export/qif-import/qif-parse.scm b/src/import-export/qif-import/qif-parse.scm index 3204a5d9cd..08fa163df2 100644 --- a/src/import-export/qif-import/qif-parse.scm +++ b/src/import-export/qif-import/qif-parse.scm @@ -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 #\,))