X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fdelete-variables.c;h=ec5d45371551ed5824101337b0e02bd7ef9757da;hb=db161068bfd5b6685f909f39b2a4701ed4941b03;hp=97c54a81b6e13ac1052011b6673dbb52f75cd16b;hpb=ea026a235eb11c9082696d0bb970096ccc6e48f6;p=pspp diff --git a/src/language/dictionary/delete-variables.c b/src/language/dictionary/delete-variables.c index 97c54a81b6..ec5d453715 100644 --- a/src/language/dictionary/delete-variables.c +++ b/src/language/dictionary/delete-variables.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2006, 2007, 2011 Free Software Foundation, Inc. + Copyright (C) 2006, 2007, 2010, 2011, 2013 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 @@ -18,12 +18,12 @@ #include -#include -#include -#include -#include -#include -#include +#include "data/casereader.h" +#include "data/dataset.h" +#include "data/dictionary.h" +#include "language/command.h" +#include "language/lexer/variable-parser.h" +#include "libpspp/message.h" #include "gettext.h" #define _(msgid) gettext (msgid) @@ -45,11 +45,12 @@ cmd_delete_variables (struct lexer *lexer, struct dataset *ds) if (var_cnt == dict_get_var_cnt (dataset_dict (ds))) { msg (SE, _("DELETE VARIABLES may not be used to delete all variables " - "from the active file dictionary. Use NEW FILE instead.")); + "from the active dataset dictionary. " + "Use NEW FILE instead.")); goto error; } - ok = casereader_destroy (proc_open (ds)); + ok = casereader_destroy (proc_open_filtering (ds, false)); ok = proc_commit (ds) && ok; if (!ok) goto error;