X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fvariable.c;h=6a00d014a18df32b7a85cb90bd3d6b3871444a7c;hb=0cd7c010e3e5c316ef0eb0317fb7f408d164679d;hp=d3f9addc4c1c4d1a4dbc23d7491ae756a748d3c8;hpb=79100bdd30230890345c1c5a09ae57a19c1e408b;p=pspp diff --git a/src/data/variable.c b/src/data/variable.c index d3f9addc4c..6a00d014a1 100644 --- a/src/data/variable.c +++ b/src/data/variable.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -80,7 +80,7 @@ struct variable static void var_set_print_format_quiet (struct variable *v, const struct fmt_spec *print); static void var_set_write_format_quiet (struct variable *v, const struct fmt_spec *write); -static bool var_set_label_quiet (struct variable *v, const char *label, bool issue_warning); +static void var_set_label_quiet (struct variable *v, const char *label); static void var_set_name_quiet (struct variable *v, const char *name); /* Creates and returns a new variable with the given NAME and @@ -103,7 +103,7 @@ var_create (const char *name, int width) type = val_type_from_width (width); v->alignment = var_default_alignment (type); v->measure = var_default_measure (type); - v->role = ROLE_NONE; + v->role = ROLE_INPUT; v->display_width = var_default_display_width (width); v->print = v->write = var_default_formats (width); attrset_init (&v->attributes); @@ -124,7 +124,7 @@ var_destroy (struct variable *v) mv_destroy (&v->miss); var_clear_short_names (v); val_labs_destroy (v->val_labs); - var_set_label_quiet (v, NULL, false); + var_set_label_quiet (v, NULL); attrset_destroy (var_get_attributes (v)); free (v->name); ds_destroy (&v->name_and_label); @@ -285,8 +285,11 @@ var_set_width_and_formats (struct variable *v, int new_width, if (fmt_resize (&v->write, new_width)) traits |= VAR_TRAIT_WRITE_FORMAT; - v->width = new_width; - traits |= VAR_TRAIT_WIDTH; + if (v->width != new_width) + { + v->width = new_width; + traits |= VAR_TRAIT_WIDTH; + } if (print) { @@ -300,7 +303,8 @@ var_set_width_and_formats (struct variable *v, int new_width, traits |= VAR_TRAIT_WRITE_FORMAT; } - dict_var_changed (v, traits, ov); + if (traits != 0) + dict_var_changed (v, traits, ov); } /* Changes the width of V to NEW_WIDTH. @@ -711,49 +715,18 @@ var_get_label (const struct variable *v) /* Sets V's variable label to UTF-8 encoded string LABEL, stripping off leading and trailing white space. If LABEL is a null pointer or if LABEL is an empty string (after stripping white space), then V's variable label (if any) - is removed. - - Variable labels are limited to 255 bytes in V's encoding (as returned by - var_get_encoding()). If LABEL fits within this limit, this function returns - true. Otherwise, the variable label is set to a truncated value, this - function returns false and, if ISSUE_WARNING is true, issues a warning. */ -static bool -var_set_label_quiet (struct variable *v, const char *label, bool issue_warning) + is removed. */ +static void +var_set_label_quiet (struct variable *v, const char *label) { - bool truncated = false; - free (v->label); v->label = NULL; if (label != NULL && label[strspn (label, CC_SPACES)]) - { - const char *dict_encoding = var_get_encoding (v); - struct substring s = ss_cstr (label); - size_t trunc_len; - - if (dict_encoding != NULL) - { - enum { MAX_LABEL_LEN = 255 }; - - trunc_len = utf8_encoding_trunc_len (label, dict_encoding, - MAX_LABEL_LEN); - if (ss_length (s) > trunc_len) - { - if (issue_warning) - msg (SW, _("Truncating variable label for variable `%s' to %d " - "bytes."), var_get_name (v), MAX_LABEL_LEN); - ss_truncate (&s, trunc_len); - truncated = true; - } - } - - v->label = ss_xstrdup (s); - } + v->label = xstrdup (label); ds_destroy (&v->name_and_label); ds_init_empty (&v->name_and_label); - - return truncated; } @@ -761,21 +734,13 @@ var_set_label_quiet (struct variable *v, const char *label, bool issue_warning) /* Sets V's variable label to UTF-8 encoded string LABEL, stripping off leading and trailing white space. If LABEL is a null pointer or if LABEL is an empty string (after stripping white space), then V's variable label (if any) - is removed. - - Variable labels are limited to 255 bytes in V's encoding (as returned by - var_get_encoding()). If LABEL fits within this limit, this function returns - true. Otherwise, the variable label is set to a truncated value, this - function returns false and, if ISSUE_WARNING is true, issues a warning. */ -bool -var_set_label (struct variable *v, const char *label, bool issue_warning) + is removed. */ +void +var_set_label (struct variable *v, const char *label) { struct variable *ov = var_clone (v); - bool truncated = var_set_label_quiet (v, label, issue_warning); - + var_set_label_quiet (v, label); dict_var_changed (v, VAR_TRAIT_LABEL, ov); - - return truncated; } @@ -783,7 +748,7 @@ var_set_label (struct variable *v, const char *label, bool issue_warning) void var_clear_label (struct variable *v) { - var_set_label (v, NULL, false); + var_set_label (v, NULL); } /* Returns true if V has a variable V, @@ -888,7 +853,7 @@ var_role_is_valid (enum var_role role) { case ROLE_NONE: case ROLE_INPUT: - case ROLE_OUTPUT: + case ROLE_TARGET: case ROLE_BOTH: case ROLE_PARTITION: case ROLE_SPLIT: @@ -905,18 +870,18 @@ var_role_to_string (enum var_role role) { switch (role) { - case ROLE_NONE: - return _("None"); - case ROLE_INPUT: return _("Input"); - case ROLE_OUTPUT: + case ROLE_TARGET: return _("Output"); case ROLE_BOTH: return _("Both"); + case ROLE_NONE: + return _("None"); + case ROLE_PARTITION: return _("Partition"); @@ -934,18 +899,18 @@ var_role_to_syntax (enum var_role role) { switch (role) { - case ROLE_NONE: - return "NONE"; - case ROLE_INPUT: return "INPUT"; - case ROLE_OUTPUT: + case ROLE_TARGET: return "TARGET"; case ROLE_BOTH: return "BOTH"; + case ROLE_NONE: + return "NONE"; + case ROLE_PARTITION: return "PARTITION"; @@ -1002,12 +967,14 @@ var_set_display_width_quiet (struct variable *v, int new_width) void var_set_display_width (struct variable *v, int new_width) { - struct variable *ov = var_clone (v); - var_set_display_width_quiet (v, new_width); - dict_var_changed (v, VAR_TRAIT_DISPLAY_WIDTH, ov); + if (v->display_width != new_width) + { + struct variable *ov = var_clone (v); + var_set_display_width_quiet (v, new_width); + dict_var_changed (v, VAR_TRAIT_DISPLAY_WIDTH, ov); + } } - /* Returns the default display width for a variable of the given WIDTH, as set by var_create. The return value can be used to reset a variable's display width to the default. */ @@ -1294,7 +1261,7 @@ var_clone (const struct variable *old_var) var_set_print_format_quiet (new_var, var_get_print_format (old_var)); var_set_write_format_quiet (new_var, var_get_write_format (old_var)); var_set_value_labels_quiet (new_var, var_get_value_labels (old_var)); - var_set_label_quiet (new_var, var_get_label (old_var), false); + var_set_label_quiet (new_var, var_get_label (old_var)); var_set_measure_quiet (new_var, var_get_measure (old_var)); var_set_role_quiet (new_var, var_get_role (old_var)); var_set_display_width_quiet (new_var, var_get_display_width (old_var)); @@ -1345,3 +1312,29 @@ var_clear_vardict (struct variable *v) { v->vardict = NULL; } + + +/* + Returns zero, if W is a missing value for WV or if it is less than zero. + Typically used to force a numerical value into a valid weight. + + As a side effect, this function will emit a warning if the value + WARN_ON_INVALID points to a bool which is TRUE. That bool will be then + set to FALSE. + */ +double +var_force_valid_weight (const struct variable *wv, double w, bool *warn_on_invalid) +{ + if (w < 0.0 || (wv && var_is_num_missing (wv, w, MV_ANY))) + w = 0.0; + + if (w == 0.0 && warn_on_invalid != NULL && *warn_on_invalid) + { + *warn_on_invalid = false; + msg (SW, _("At least one case in the data file had a weight value " + "that was user-missing, system-missing, zero, or " + "negative. These case(s) were ignored.")); + } + + return w; +}