From 6c0dc2d7fc9989354f1b25a681511709f73e98a1 Mon Sep 17 00:00:00 2001
From: Charles Day <cedayiv@gmail.com>
Date: Fri, 26 Sep 2008 23:32:07 +0000
Subject: [PATCH] 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. BP

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17598 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 src/import-export/qif-import/qif-file.scm    | 3 +--
 src/import-export/qif-import/qif-objects.scm | 2 +-
 src/import-export/qif-import/qif-parse.scm   | 8 ++++----
 3 files changed, 6 insertions(+), 7 deletions(-)

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 <qif-split>
+;;  [S]/[E]/[$] splits : a list of <qif-split>
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (define <qif-xtn>
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 #\,))