[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] Changes to pspp/src/get.c
From: |
Ben Pfaff |
Subject: |
[Pspp-cvs] Changes to pspp/src/get.c |
Date: |
Thu, 05 May 2005 02:59:55 -0400 |
Index: pspp/src/get.c
diff -u pspp/src/get.c:1.28 pspp/src/get.c:1.29
--- pspp/src/get.c:1.28 Tue May 3 05:32:22 2005
+++ pspp/src/get.c Thu May 5 06:59:54 2005
@@ -957,6 +957,8 @@
}
}
+ /* Set up mapping from each file's variables to master
+ variables. */
for (iter = mtf.head; iter != NULL; iter = iter->next)
{
struct dictionary *d = iter->dict;
@@ -971,6 +973,7 @@
}
}
+ /* Add IN variables to master dictionary. */
for (iter = mtf.head; iter != NULL; iter = iter->next)
if (iter->in_name != NULL)
{
@@ -1398,13 +1401,14 @@
}
}
- dict_compact_values (d);
-
for (i = 0; i < dict_get_var_cnt (d); i++)
{
struct variable *dv = dict_get_var (d, i);
struct variable *mv = dict_lookup_var (m, dv->name);
+ if (dict_class_from_id (dv->name) == DC_SCRATCH)
+ continue;
+
if (mv != NULL)
{
if (mv->width != dv->width)