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

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Changes by:     Ben Pfaff <blp> 07/09/14 13:45:03

Modified files:
        src/data       : ChangeLog dictionary.c 

Log message:
        (dict_clone): Copy case indexes from cloned dictionary.  Fixes bug
        #21061.  Reviewed by John Darrington.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/ChangeLog?cvsroot=pspp&r1=1.157&r2=1.158
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/dictionary.c?cvsroot=pspp&r1=1.46&r2=1.47

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/ChangeLog,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -b -r1.157 -r1.158
--- ChangeLog   13 Sep 2007 12:37:08 -0000      1.157
+++ ChangeLog   14 Sep 2007 13:45:02 -0000      1.158
@@ -1,4 +1,9 @@
-2007-09-13  John Darrinton <address@hidden>
+2007-09-14  Ben Pfaff  <address@hidden>
+
+       * dictionary.c (dict_clone): Copy case indexes from cloned
+       dictionary.  Fixes bug #21061.  Reviewed by John Darrington.
+
+2007-09-13  John Darrington <address@hidden>
 
        * value.c value.h (create_value): New function.
 
@@ -15,7 +20,7 @@
        * casewriter-translator.c (struct casewriter_translator): Ditto.
        (casewriter_create_translator): Ditto.
 
-2007-08-27  John Darrinton <address@hidden>
+2007-08-27  John Darrington <address@hidden>
        
        * sys-file-reader.c (read_display_parameters): Force display width 
        to 8, if the sys file says 0 (like SPSS does).

Index: dictionary.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/dictionary.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- dictionary.c        27 Aug 2007 07:02:35 -0000      1.46
+++ dictionary.c        14 Sep 2007 13:45:03 -0000      1.47
@@ -116,7 +116,13 @@
 }
 
 /* Creates and returns a (deep) copy of an existing
-   dictionary. */
+   dictionary.
+
+   The new dictionary's case indexes are copied from the old
+   dictionary.  If the new dictionary won't be used to access
+   cases produced with the old dictionary, then the new
+   dictionary's case indexes should be compacted with
+   dict_compact_values to save space. */
 struct dictionary *
 dict_clone (const struct dictionary *s)
 {
@@ -135,6 +141,8 @@
 
       for (i = 0; i < var_get_short_name_cnt (sv); i++)
         var_set_short_name (dv, i, var_get_short_name (sv, i));
+
+      var_set_vardict (dv, var_get_vardict (sv));
     }
 
   d->next_value_idx = s->next_value_idx;