Revamp SAVE, XSAVE, EXPORT. Add (or at least parse) all the

[pspp-builds.git] / src / aggregate.c

diff --git a/src/aggregate.c b/src/aggregate.c
index 8fe168ecf78175581c92de4d50f4c3ba6bb0b144..5979204d08c0c407a078f2ca1ad367665ff0ed67 100644 (file)
--- a/src/aggregate.c
+++ b/src/aggregate.c
@@ -40,6 +40,9 @@
 #include "vfm.h"
 #include "vfmP.h"
 
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
 /* Specifies how to make an aggregate variable. */
 struct agr_var
   {
@@ -275,7 +278,8 @@ cmd_aggregate (void)
     }
   else
     {
-      agr.writer = sfm_open_writer (out_file, agr.dict, get_scompression (), 0);
+      agr.writer = sfm_open_writer (out_file, agr.dict,
+                                    sfm_writer_default_options ());
       if (agr.writer == NULL)
         goto error;
       
@@ -723,7 +727,8 @@ accumulate_aggregate_info (struct agr_proc *agr,
       {
        const union value *v = case_data (input, iter->src->fv);
 
-       if ((!iter->include_missing && is_missing (v, iter->src))
+       if ((!iter->include_missing
+             && mv_is_value_missing (&iter->src->miss, v))
            || (iter->include_missing && iter->src->type == NUMERIC
                && v->f == SYSMIS))
          {