[Pspp-cvs] pspp/src/data ChangeLog data-in.c

[John Darrington]

CVSROOT:        /sources/pspp
Module name:    pspp
Changes by:     John Darrington <jmd>   08/03/18 08:08:13

Modified files:
        src/data       : ChangeLog data-in.c 

Log message:
        Fixed bug #21801

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/ChangeLog?cvsroot=pspp&r1=1.193&r2=1.194
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/data-in.c?cvsroot=pspp&r1=1.28&r2=1.29

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/pspp/pspp/src/data/ChangeLog,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -b -r1.193 -r1.194
--- ChangeLog   7 Mar 2008 06:03:51 -0000       1.193
+++ ChangeLog   18 Mar 2008 08:08:12 -0000      1.194
@@ -1,3 +1,8 @@
+2008-03-18  John Darrington <address@hidden>
+
+       * data-in.c: If category is custom currency, then use
+       numeric format for input.
+
 2008-03-06  Ben Pfaff  <address@hidden>
 
        * dictionary.c (var_name_is_insertable): New function.

Index: data-in.c
===================================================================
RCS file: /sources/pspp/pspp/src/data/data-in.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- data-in.c   14 Mar 2008 10:42:53 -0000      1.28
+++ data-in.c   18 Mar 2008 08:08:13 -0000      1.29
@@ -171,7 +171,10 @@
   int save_errno;
   char *tail;
 
-  assert (fmt_get_category (i->format) != FMT_CAT_CUSTOM);
+  if  (fmt_get_category (i->format) == FMT_CAT_CUSTOM)
+    {
+      style = settings_get_style (FMT_F);
+    }
 
   /* Trim spaces and check for missing value representation. */
   if (trim_spaces_and_check_missing (i))