projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement missing values for long string variables.
[pspp-builds.git]
/
src
/
language
/
dictionary
/
sys-file-info.c
diff --git
a/src/language/dictionary/sys-file-info.c
b/src/language/dictionary/sys-file-info.c
index ce25f78a1925ce040d687b062328a48c08b7b216..8f2ab7d7a04de75ca753a4fd700326b787695da5 100644
(file)
--- a/
src/language/dictionary/sys-file-info.c
+++ b/
src/language/dictionary/sys-file-info.c
@@
-582,18
+582,18
@@
describe_variable (const struct variable *v, struct tab_table *t, int r,
/* Missing values if any. */
if (flags & DF_MISSING_VALUES && var_has_missing_values (v))
{
/* Missing values if any. */
if (flags & DF_MISSING_VALUES && var_has_missing_values (v))
{
+ const struct missing_values *mv = var_get_missing_values (v);
char buf[128];
char *cp;
char buf[128];
char *cp;
- struct missing_values mv;
int cnt = 0;
int cnt = 0;
+ int i;
cp = stpcpy (buf, _("Missing Values: "));
cp = stpcpy (buf, _("Missing Values: "));
- mv_copy (&mv, var_get_missing_values (v));
- if (mv_has_range (&mv))
+ if (mv_has_range (mv))
{
double x, y;
{
double x, y;
- mv_
pop_range (&
mv, &x, &y);
+ mv_
get_range (
mv, &x, &y);
if (x == LOWEST)
cp += sprintf (cp, "LOWEST THRU %g", y);
else if (y == HIGHEST)
if (x == LOWEST)
cp += sprintf (cp, "LOWEST THRU %g", y);
else if (y == HIGHEST)
@@
-602,19
+602,21
@@
describe_variable (const struct variable *v, struct tab_table *t, int r,
cp += sprintf (cp, "%g THRU %g", x, y);
cnt++;
}
cp += sprintf (cp, "%g THRU %g", x, y);
cnt++;
}
-
while (mv_has_value (&mv)
)
+
for (i = 0; i < mv_n_values (mv); i++
)
{
{
- union value value;
- mv_pop_value (&mv, &value);
+ const union value *value = mv_get_value (mv, i);
if (cnt++ > 0)
cp += sprintf (cp, "; ");
if (var_is_numeric (v))
if (cnt++ > 0)
cp += sprintf (cp, "; ");
if (var_is_numeric (v))
- cp += sprintf (cp, "%g", value
.
f);
+ cp += sprintf (cp, "%g", value
->
f);
else
{
else
{
+ int width = var_get_width (v);
+ int mv_width = MIN (width, MV_MAX_STRING);
+
*cp++ = '"';
*cp++ = '"';
- memcpy (cp, value
.s, var_get_width (v)
);
- cp +=
var_get_width (v)
;
+ memcpy (cp, value
_str (value, width), mv_width
);
+ cp +=
mv_width
;
*cp++ = '"';
*cp = '\0';
}
*cp++ = '"';
*cp = '\0';
}
@@
-628,9
+630,10
@@
describe_variable (const struct variable *v, struct tab_table *t, int r,
if (flags & DF_VALUE_LABELS && var_has_value_labels (v))
{
const struct val_labs *val_labs = var_get_value_labels (v);
if (flags & DF_VALUE_LABELS && var_has_value_labels (v))
{
const struct val_labs *val_labs = var_get_value_labels (v);
- s
truct val_labs_iterator *i
;
-
struct val_lab *vl
;
+ s
ize_t n_labels = val_labs_count (val_labs)
;
+
const struct val_lab **labels
;
int orig_r = r;
int orig_r = r;
+ size_t i;
#if 0
tab_text (t, 1, r, TAB_LEFT, _("Value"));
#if 0
tab_text (t, 1, r, TAB_LEFT, _("Value"));
@@
-639,23
+642,27
@@
describe_variable (const struct variable *v, struct tab_table *t, int r,
#endif
tab_hline (t, TAL_1, 1, 2, r);
#endif
tab_hline (t, TAL_1, 1, 2, r);
- for (vl = val_labs_first_sorted (val_labs, &i); vl != NULL;
- vl = val_labs_next (val_labs, &i))
+
+ labels = val_labs_sorted (val_labs);
+ for (i = 0; i < n_labels; i++)
{
{
- char buf[128];
+ const struct val_lab *vl = labels[i];
+ char buf[MAX_STRING + 1];
if (var_is_alpha (v))
{
if (var_is_alpha (v))
{
- memcpy (buf, vl->value.s, var_get_width (v));
- buf[var_get_width (v)] = 0;
+ int width = var_get_width (v);
+ memcpy (buf, value_str (&vl->value, width), width);
+ buf[width] = 0;
}
else
sprintf (buf, "%g", vl->value.f);
tab_text (t, 1, r, TAB_NONE, buf);
}
else
sprintf (buf, "%g", vl->value.f);
tab_text (t, 1, r, TAB_NONE, buf);
- tab_text (t, 2, r, TAB_LEFT, v
l->label
);
+ tab_text (t, 2, r, TAB_LEFT, v
al_lab_get_label (vl)
);
r++;
}
r++;
}
+ free (labels);
tab_vline (t, TAL_1, 2, orig_r, r - 1);
}
tab_vline (t, TAL_1, 2, orig_r, r - 1);
}