Make FILTER without any further keywords turn off filtering, with a

warning, for compatibility.  Change errors from cascading failures to
ordinary failures.  Check for command terminator.

diff --git a/src/language/xforms/ChangeLog b/src/language/xforms/ChangeLog
index 894e299030d53e3f5a4ecaccbd7565b04daa791b..b48427d55252f2b78795eb7b05a9bb70ad12ff9b 100644 (file)
--- a/src/language/xforms/ChangeLog
+++ b/src/language/xforms/ChangeLog
@@ -1,3 +1,10 @@
+Sat May  6 14:08:42 2006  Ben Pfaff  <blp@gnu.org>
+
+       * select-if.c (cmd_filter): Make FILTER without any further
+       keywords turn off filtering, with a warning, for compatibility.
+       Change errors from cascading failures to ordinary failures.  Check
+       for command terminator.
+
 Sat May  6 13:25:57 2006  Ben Pfaff  <blp@gnu.org>
 
        Continue reforming procedure execution.  In this phase, remove

diff --git a/src/language/xforms/select-if.c b/src/language/xforms/select-if.c
index f5b55ff9be7f7ed46c59382f9fd6971198ef6fb7..ddeb4a05f4e9187afc058217d044fd9f8becd3e2 100644 (file)
--- a/src/language/xforms/select-if.c
+++ b/src/language/xforms/select-if.c
@@ -95,6 +95,12 @@ cmd_filter (void)
 {
   if (lex_match_id ("OFF"))
     dict_set_filter (default_dict, NULL);
+  else if (token == '.') 
+    {
+      msg (SW, _("Syntax error expecting OFF or BY.  "
+                 "Turning off case filtering."));
+      dict_set_filter (default_dict, NULL);
+    }
   else
     {
       struct variable *v;
@@ -102,22 +108,22 @@ cmd_filter (void)
       lex_match (T_BY);
       v = parse_variable ();
       if (!v)
-       return CMD_CASCADING_FAILURE;
+       return CMD_FAILURE;
 
       if (v->type == ALPHA)
        {
          msg (SE, _("The filter variable must be numeric."));
-         return CMD_CASCADING_FAILURE;
+         return CMD_FAILURE;
        }
 
       if (dict_class_from_id (v->name) == DC_SCRATCH)
        {
          msg (SE, _("The filter variable may not be scratch."));
-         return CMD_CASCADING_FAILURE;
+         return CMD_FAILURE;
        }
 
       dict_set_filter (default_dict, v);
     }
 
-  return CMD_SUCCESS;
+  return lex_end_of_command ();
 }