[Pspp-cvs] pspp/src/data ChangeLog por-file-writer.c

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Changes by:     Ben Pfaff <blp> 07/07/25 04:09:45

Modified files:
        src/data       : ChangeLog por-file-writer.c 

Log message:
        Fix bug #20427.
        * por-file-writer.c (write_variables): Write weight variable.
        Reviewed by John Darrington.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/ChangeLog?cvsroot=pspp&r1=1.140&r2=1.141
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/por-file-writer.c?cvsroot=pspp&r1=1.14&r2=1.15

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/ChangeLog,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -b -r1.140 -r1.141
--- ChangeLog   24 Jul 2007 05:33:43 -0000      1.140
+++ ChangeLog   25 Jul 2007 04:09:44 -0000      1.141
@@ -1,3 +1,9 @@
+2007-07-24  Ben Pfaff  <address@hidden>
+
+       Fix bug #20427.
+       * por-file-writer.c (write_variables): Write weight variable.
+       Reviewed by John Darrington.
+
 2007-07-23  Ben Pfaff  <address@hidden>
 
        Improvements to system file reader and writer.
@@ -129,6 +135,8 @@
        (write_zeros): New function.
        (write_spaces): New function.
 
+       Reviewed by John Darrington.
+
 2007-07-22  Ben Pfaff  <address@hidden>
 
        Don't try to write very long strings to portable files.  The
@@ -140,11 +148,13 @@
        (write_value): Limit width of value written to MAX_POR_WIDTH.
        (write_variables): Limit width of variable and its output formats
        to MAX_POR_WIDTH.
+       Reviewed by John Darrington.
 
 2007-07-22  Ben Pfaff  <address@hidden>
 
        * sys-file-reader.c (read_variable_to_value_map): Use max_warnings
        local variable instead of literal 5.
+       Reviewed by John Darrington.
        
 2007-07-22  Ben Pfaff  <address@hidden>
 
@@ -189,6 +199,8 @@
        (var_clear_short_name): Renamed var_clear_short_names, changed to
        clear all short names.
        
+       Reviewed by John Darrington.
+
 2007-07-22  Ben Pfaff  <address@hidden>
 
        * variable.c (var_set_width): Use new var_set_width function.
@@ -199,6 +211,8 @@
        * format.c (fmt_default_for_width): New function.
        (fmt_resize): New function.
 
+       Reviewed by John Darrington.
+
 2007-07-18 John Darrington <address@hidden>
 
        * datasheet.c (datasheet_delete_columns): Added assertion to check

Index: por-file-writer.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/por-file-writer.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- por-file-writer.c   23 Jul 2007 05:11:58 -0000      1.14
+++ por-file-writer.c   25 Jul 2007 04:09:44 -0000      1.15
@@ -322,6 +322,12 @@
 
   short_names_assign (dict);
 
+  if (dict_get_weight (dict) != NULL) 
+    {
+      buf_write (w, "6", 1);
+      write_string (w, var_get_short_name (dict_get_weight (dict), 0));
+    }
+  
   buf_write (w, "4", 1);
   write_int (w, dict_get_var_cnt (dict));
   write_int (w, 161);