X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fdelete-variables.c;h=770ca3f3e13540e90dcf5f511ebc82b9b4c9a55f;hb=af8fe020fa47f88b896924092297fb40c7831b1e;hp=5cee7035f8fb17a8b21de494fc687a19329dde0a;hpb=f5c108becd49d78f4898cab11352291f5689d24e;p=pspp

diff --git a/src/language/dictionary/delete-variables.c b/src/language/dictionary/delete-variables.c
index 5cee7035f8..770ca3f3e1 100644
--- a/src/language/dictionary/delete-variables.c
+++ b/src/language/dictionary/delete-variables.c
@@ -1,32 +1,29 @@
-/* PSPP - computes sample statistics.
-   Copyright (C) 2006, 2007 Free Software Foundation, Inc.
-   Written by Ben Pfaff <blp@gnu.org>.
+/* PSPP - a program for statistical analysis.
+   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 the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   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
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA. */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
 
 #include <stdlib.h>
 
-#include <data/casereader.h>
-#include <data/dictionary.h>
-#include <data/procedure.h>
-#include <language/command.h>
-#include <language/lexer/variable-parser.h>
-#include <libpspp/message.h>
+#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)
@@ -40,20 +37,21 @@ cmd_delete_variables (struct lexer *lexer, struct dataset *ds)
   bool ok;
 
   if (proc_make_temporary_transformations_permanent (ds))
-    msg (SE, _("DELETE VARIABLES may not be used after TEMPORARY.  "
-               "Temporary transformations will be made permanent."));
+    msg (SE, _("%s may not be used after %s.  "
+               "Temporary transformations will be made permanent."), 
+	 "DELETE VARIABLES", "TEMPORARY");
 
-  if (!parse_variables (lexer, dataset_dict (ds), &vars, &var_cnt,
-			      PV_NONE))
+  if (!parse_variables (lexer, dataset_dict (ds), &vars, &var_cnt, PV_NONE))
     goto error;
   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."));
+      msg (SE, _("%s may not be used to delete all variables "
+                 "from the active dataset dictionary.  "
+                 "Use %s instead."), "DELETE VARIABLES", "NEW FILE");
       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;