X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fapply-dictionary.c;h=0c9f2ade468d290cfdad8877b3cde1e1d2c4422b;hb=909f10f57c532130c7fb16c103b1328416f5fb06;hp=1c9e7ef81a19d95647f0ca7f6cb6aea90969bc2b;hpb=81fff61a96bece351e381ad3fef8ab1248a952ba;p=pspp-builds.git diff --git a/src/language/dictionary/apply-dictionary.c b/src/language/dictionary/apply-dictionary.c index 1c9e7ef8..0c9f2ade 100644 --- a/src/language/dictionary/apply-dictionary.c +++ b/src/language/dictionary/apply-dictionary.c @@ -1,6 +1,5 @@ /* PSPP - computes sample statistics. Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. - Written by Ben Pfaff . This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -24,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -39,7 +39,7 @@ /* Parses and executes APPLY DICTIONARY. */ int -cmd_apply_dictionary (void) +cmd_apply_dictionary (struct lexer *lexer, struct dataset *ds) { struct file_handle *handle; struct any_reader *reader; @@ -49,9 +49,9 @@ cmd_apply_dictionary (void) int i; - lex_match_id ("FROM"); - lex_match ('='); - handle = fh_parse (FH_REF_FILE | FH_REF_SCRATCH); + lex_match_id (lexer, "FROM"); + lex_match (lexer, '='); + handle = fh_parse (lexer, FH_REF_FILE | FH_REF_SCRATCH); if (!handle) return CMD_FAILURE; @@ -63,91 +63,61 @@ cmd_apply_dictionary (void) for (i = 0; i < dict_get_var_cnt (dict); i++) { struct variable *s = dict_get_var (dict, i); - struct variable *t = dict_lookup_var (default_dict, s->name); + struct variable *t = dict_lookup_var (dataset_dict (ds), + var_get_name (s)); if (t == NULL) continue; n_matched++; - if (s->type != t->type) + if (var_get_type (s) != var_get_type (t)) { msg (SW, _("Variable %s is %s in target file, but %s in " "source file."), - s->name, - t->type == ALPHA ? _("string") : _("numeric"), - s->type == ALPHA ? _("string") : _("numeric")); + var_get_name (s), + var_is_alpha (t) ? _("string") : _("numeric"), + var_is_alpha (s) ? _("string") : _("numeric")); continue; } - if (s->label && strcspn (s->label, " ") != strlen (s->label)) - { - free (t->label); - t->label = s->label; - s->label = NULL; - } - - if (val_labs_count (s->val_labs) && t->width > MAX_SHORT_STRING) - msg (SW, _("Cannot add value labels from source file to " - "long string variable %s."), - s->name); - else if (val_labs_count (s->val_labs)) - { - /* Whether to apply the value labels. */ - int apply = 1; - - if (t->width < s->width) - { - struct val_labs_iterator *i; - struct val_lab *lab; - - for (lab = val_labs_first (s->val_labs, &i); lab != NULL; - lab = val_labs_next (s->val_labs, &i)) - { - int j; - - /* We will apply the value labels only if all - the truncated characters are blanks. */ - for (j = t->width; j < s->width; j++) - if (lab->value.s[j] != ' ') - { - val_labs_done (&i); - apply = 0; - break; - } - } - } - else - { - /* Fortunately, we follow the convention that all value - label values are right-padded with spaces, so it is - unnecessary to bother padding values here. */ - } - - if (apply) + if (var_get_label (s)) + { + const char *label = var_get_label (s); + if (strcspn (label, " ") != strlen (label)) + var_set_label (t, label); + } + + if (var_has_value_labels (s)) + { + if (!var_is_long_string (t)) { - val_labs_destroy (t->val_labs); - t->val_labs = s->val_labs; - val_labs_set_width (t->val_labs, t->width); - s->val_labs = val_labs_create (s->width); + const struct val_labs *value_labels = var_get_value_labels (s); + if (val_labs_can_set_width (value_labels, var_get_width (t))) + var_set_value_labels (s, value_labels); } - } - - if (!mv_is_empty (&s->miss) && t->width > MAX_SHORT_STRING) - msg (SW, _("Cannot apply missing values from source file to " - "long string variable %s."), - s->name); - else if (!mv_is_empty (&s->miss)) - { - if (mv_is_resizable (&s->miss, t->width)) + else + msg (SW, _("Cannot add value labels from source file to " + "long string variable %s."), + var_get_name (s)); + } + + if (var_has_missing_values (s)) + { + if (!var_is_long_string (t)) { - mv_copy (&t->miss, &s->miss); - mv_resize (&t->miss, t->width); + const struct missing_values *miss = var_get_missing_values (s); + if (mv_is_resizable (miss, var_get_width (t))) + var_set_missing_values (t, miss); } - } + else + msg (SW, _("Cannot apply missing values from source file to " + "long string variable %s."), + var_get_name (s)); + } - if (s->type == NUMERIC) + if (var_is_numeric (s)) { - t->print = s->print; - t->write = s->write; + var_set_print_format (t, var_get_print_format (s)); + var_set_write_format (t, var_get_write_format (s)); } } @@ -159,13 +129,14 @@ cmd_apply_dictionary (void) if (dict_get_weight (dict) != NULL) { struct variable *new_weight - = dict_lookup_var (default_dict, dict_get_weight (dict)->name); + = dict_lookup_var (dataset_dict (ds), + var_get_name (dict_get_weight (dict))); if (new_weight != NULL) - dict_set_weight (default_dict, new_weight); + dict_set_weight (dataset_dict (ds), new_weight); } any_reader_close (reader); - return lex_end_of_command (); + return lex_end_of_command (lexer); }