[Pspp-cvs] pspp/src/data ChangeLog sys-file-reader.c

[John Darrington]

CVSROOT:        /sources/pspp
Module name:    pspp
Changes by:     John Darrington <jmd>   07/08/27 00:06:23

Modified files:
        src/data       : ChangeLog sys-file-reader.c 

Log message:
        Force display width to 8, if sys file says zero. Closes bug #20844

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/ChangeLog?cvsroot=pspp&r1=1.154&r2=1.155
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/sys-file-reader.c?cvsroot=pspp&r1=1.44&r2=1.45

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/pspp/pspp/src/data/ChangeLog,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -b -r1.154 -r1.155
--- ChangeLog   13 Aug 2007 04:31:43 -0000      1.154
+++ ChangeLog   27 Aug 2007 00:06:23 -0000      1.155
@@ -1,3 +1,8 @@
+2007-08-27  John Darrinton <address@hidden>
+       
+       * sys-file-reader.c (read_display_parameters): Force display width 
+       to 8, if the sys file says 0 (like SPSS does).
+
 2007-08-12  Ben Pfaff  <address@hidden>
 
        * dictionary.c (dict_dump): New function.

Index: sys-file-reader.c
===================================================================
RCS file: /sources/pspp/pspp/src/data/sys-file-reader.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- sys-file-reader.c   24 Jul 2007 05:33:43 -0000      1.44
+++ sys-file-reader.c   27 Aug 2007 00:06:23 -0000      1.45
@@ -857,6 +857,11 @@
       if (0 == measure && var_is_alpha (v))
         measure = 1;
 
+      /* Older versions (SPSS 9.0) sometimes set the display width
+        to zero.  This causes confusion especially in the GUI */
+      if (0 == width)
+       width = 8;
+
       if (measure < 1 || measure > 3 || align < 0 || align > 2)
         {
           if (!warned)