AUDIT: r14523 - gnucash/trunk - Allow comma-radix numbers without a radix. Fixes #142424.

[Derek Atkins]

Author: warlord
Date: 2006-07-16 19:01:00 -0400 (Sun, 16 Jul 2006)
New Revision: 14523
Trac: http://svn.gnucash.org/trac/changeset/14523

Modified:
   gnucash/trunk/
   gnucash/trunk/ChangeLog
   gnucash/trunk/src/import-export/qif-import/qif-parse.scm
Log:
Allow comma-radix numbers without a radix.  Fixes #142424.
I.e., allow "17.500" to be parsed either as "seventeen and a half"
or as "seventeen thousand five hundred".  Note that numbers STILL
default to decimal-radix instead of asking the user to choose.
BP




Property changes on: gnucash/trunk
___________________________________________________________________
Name: svk:merge
   - d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:12878
   + d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:12879

Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2006-07-16 23:00:52 UTC (rev 14522)
+++ gnucash/trunk/ChangeLog	2006-07-16 23:01:00 UTC (rev 14523)
@@ -8,6 +8,12 @@
 	* src/import-export/qif-import/qif-file.scm:
 	  Ignore any unknown !Option specification.  Fixes #160735.
 
+	* src/import-export/qif-import/qif-parse.scm:
+	  Allow comma-radix numbers without a radix.  Fixes #142424.
+	  I.e., allow "17.500" to be parsed either as "seventeen and a half"
+	  or as "seventeen thousand five hundred".  Note that numbers STILL
+	  default to decimal-radix instead of asking the user to choose.
+
 2006-07-16  Andreas Köhler  <andi5.py at gmx.net>
 
 	* src/gnome-utils/gnc-main-window.c: Do not move windows on

Modified: gnucash/trunk/src/import-export/qif-import/qif-parse.scm
===================================================================
--- gnucash/trunk/src/import-export/qif-import/qif-parse.scm	2006-07-16 23:00:52 UTC (rev 14522)
+++ gnucash/trunk/src/import-export/qif-import/qif-parse.scm	2006-07-16 23:01:00 UTC (rev 14523)
@@ -23,7 +23,7 @@
 
 (define comma-radix-regexp
   (make-regexp 
-   "^ *\\$?[+-]?\\$?[0-9]+$|^ *\\$?[+-]?\\$?[0-9]?[0-9]?[0-9]?(\\.[0-9][0-9][0-9])*(,[0-9]*) *$|^ *\\$?[+-]?\\$?[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 "^\\$?[+-]?\\$?[0-9]+ *$"))