r14561 - gnucash/branches/2.0 - Allow comma-radix numbers without a radix. Fixes #142424.

[Derek Atkins]

Author: warlord
Date: 2006-07-25 22:36:11 -0400 (Tue, 25 Jul 2006)
New Revision: 14561
Trac: http://svn.gnucash.org/trac/changeset/14561

Modified:
   gnucash/branches/2.0/
   gnucash/branches/2.0/ChangeLog
   gnucash/branches/2.0/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.

Audited by jsled
Merge from r14523.



Property changes on: gnucash/branches/2.0
___________________________________________________________________
Name: svk:merge
   - d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/branches/2.0:12933
   + d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/branches/2.0:12934

Modified: gnucash/branches/2.0/ChangeLog
===================================================================
--- gnucash/branches/2.0/ChangeLog	2006-07-26 02:36:00 UTC (rev 14560)
+++ gnucash/branches/2.0/ChangeLog	2006-07-26 02:36:11 UTC (rev 14561)
@@ -35,6 +35,14 @@
 	* src/import-export/qif-import/qif-file.scm:
 	  Ignore any unknown !Option specification.  Fixes #160735.
 
+2006-07-15  Derek Atkins  <derek at ihtfp.com>
+
+	* 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.
+
 	* src/business/business-gnome/dialog-invoice.c:
 	  Set the summary bar values when the window is first opened (#345978).
 

Modified: gnucash/branches/2.0/src/import-export/qif-import/qif-parse.scm
===================================================================
--- gnucash/branches/2.0/src/import-export/qif-import/qif-parse.scm	2006-07-26 02:36:00 UTC (rev 14560)
+++ gnucash/branches/2.0/src/import-export/qif-import/qif-parse.scm	2006-07-26 02:36:11 UTC (rev 14561)
@@ -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]+ *$"))