AUDIT: r17598 - gnucash/trunk/src/import-export/qif-import - 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.

[Charles Day]

Author: cedayiv
Date: 2008-09-26 19:32:07 -0400 (Fri, 26 Sep 2008)
New Revision: 17598
Trac: http://svn.gnucash.org/trac/changeset/17598

Modified:
   gnucash/trunk/src/import-export/qif-import/qif-file.scm
   gnucash/trunk/src/import-export/qif-import/qif-objects.scm
   gnucash/trunk/src/import-export/qif-import/qif-parse.scm
Log:
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


Modified: gnucash/trunk/src/import-export/qif-import/qif-file.scm
===================================================================
--- gnucash/trunk/src/import-export/qif-import/qif-file.scm	2008-09-26 20:55:39 UTC (rev 17597)
+++ gnucash/trunk/src/import-export/qif-import/qif-file.scm	2008-09-26 23:32:07 UTC (rev 17598)
@@ -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)))

Modified: gnucash/trunk/src/import-export/qif-import/qif-objects.scm
===================================================================
--- gnucash/trunk/src/import-export/qif-import/qif-objects.scm	2008-09-26 20:55:39 UTC (rev 17597)
+++ gnucash/trunk/src/import-export/qif-import/qif-objects.scm	2008-09-26 23:32:07 UTC (rev 17598)
@@ -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>

Modified: gnucash/trunk/src/import-export/qif-import/qif-parse.scm
===================================================================
--- gnucash/trunk/src/import-export/qif-import/qif-parse.scm	2008-09-26 20:55:39 UTC (rev 17597)
+++ gnucash/trunk/src/import-export/qif-import/qif-parse.scm	2008-09-26 23:32:07 UTC (rev 17598)
@@ -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 #\,))