X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Faggregate.c;h=eace3479a18b17568430c7c525293faf4c31a38e;hb=9e24f9a5c52650da0700066e8d9e72261c6492ad;hp=dcadff965cf76ebd2ad73c99f16d1c3c25fd0f14;hpb=136f39b107e427c984fa0d74dc11d1b4bc04e898;p=pspp-builds.git

diff --git a/src/language/stats/aggregate.c b/src/language/stats/aggregate.c
index dcadff96..eace3479 100644
--- a/src/language/stats/aggregate.c
+++ b/src/language/stats/aggregate.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006, 2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 2008, 2009, 2010, 2011 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
@@ -16,40 +16,41 @@
 
 #include <config.h>
 
+#include "language/stats/aggregate.h"
+
 #include <stdlib.h>
 
-#include <data/any-writer.h>
-#include <data/case.h>
-#include <data/casegrouper.h>
-#include <data/casereader.h>
-#include <data/casewriter.h>
-#include <data/dictionary.h>
-#include <data/file-handle-def.h>
-#include <data/format.h>
-#include <data/procedure.h>
-#include <data/settings.h>
-#include <data/subcase.h>
-#include <data/sys-file-writer.h>
-#include <data/variable.h>
-#include <language/command.h>
-#include <language/data-io/file-handle.h>
-#include <language/lexer/lexer.h>
-#include <language/lexer/variable-parser.h>
-#include <language/stats/sort-criteria.h>
-#include <libpspp/assertion.h>
-#include <libpspp/message.h>
-#include <libpspp/misc.h>
-#include <libpspp/pool.h>
-#include <libpspp/str.h>
-#include <math/moments.h>
-#include <math/sort.h>
-#include <math/statistic.h>
-#include <math/percentiles.h>
-
-#include "aggregate.h"
-
-#include "minmax.h"
-#include "xalloc.h"
+#include "data/any-writer.h"
+#include "data/case.h"
+#include "data/casegrouper.h"
+#include "data/casereader.h"
+#include "data/casewriter.h"
+#include "data/dataset.h"
+#include "data/dictionary.h"
+#include "data/file-handle-def.h"
+#include "data/format.h"
+#include "data/settings.h"
+#include "data/subcase.h"
+#include "data/sys-file-writer.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/data-io/file-handle.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/variable-parser.h"
+#include "language/stats/sort-criteria.h"
+#include "libpspp/assertion.h"
+#include "libpspp/i18n.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "libpspp/pool.h"
+#include "libpspp/str.h"
+#include "math/moments.h"
+#include "math/percentiles.h"
+#include "math/sort.h"
+#include "math/statistic.h"
+
+#include "gl/minmax.h"
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -350,7 +351,8 @@ cmd_aggregate (struct lexer *lexer, struct dataset *ds)
       if (next_input == NULL)
         goto error;
 
-      proc_set_active_file (ds, next_input, agr.dict);
+      dataset_set_dict (ds, agr.dict);
+      dataset_set_source (ds, next_input);
       agr.dict = NULL;
     }
   else
@@ -416,7 +418,7 @@ parse_aggregate_functions (struct lexer *lexer, const struct dictionary *dict,
 	{
 	  size_t n_dest_prev = n_dest;
 
-	  if (!parse_DATA_LIST_vars (lexer, &dest, &n_dest,
+	  if (!parse_DATA_LIST_vars (lexer, dict, &dest, &n_dest,
                                      (PV_APPEND | PV_SINGLE | PV_NO_SCRATCH
                                       | PV_NO_DUPLICATE)))
 	    goto error;
@@ -434,14 +436,8 @@ parse_aggregate_functions (struct lexer *lexer, const struct dictionary *dict,
 
 	  if (lex_is_string (lexer))
 	    {
-              /* XXX check re-encoded length */
-	      struct string label;
-	      ds_init_substring (&label, lex_tokss (lexer));
-
-	      ds_truncate (&label, 255);
-	      dest_label[n_dest - 1] = ds_xstrdup (&label);
+	      dest_label[n_dest - 1] = xstrdup (lex_tokcstr (lexer));
 	      lex_get (lexer);
-	      ds_destroy (&label);
 	    }
 	}
 
@@ -453,7 +449,7 @@ parse_aggregate_functions (struct lexer *lexer, const struct dictionary *dict,
 	}
 
       ds_assign_substring (&function_name, lex_tokss (lexer));
-      exclude = ds_chomp (&function_name, '.') ? MV_SYSTEM : MV_ANY;
+      exclude = ds_chomp_byte (&function_name, '.') ? MV_SYSTEM : MV_ANY;
 
       for (function = agr_func_tab; function->name; function++)
 	if (!strcasecmp (function->name, ds_cstr (&function_name)))
@@ -502,7 +498,9 @@ parse_aggregate_functions (struct lexer *lexer, const struct dictionary *dict,
 		lex_match (lexer, T_COMMA);
 		if (lex_is_string (lexer))
 		  {
-		    arg[i].c = ss_xstrdup (lex_tokss (lexer));
+		    arg[i].c = recode_string (dict_get_encoding (agr->dict),
+                                              "UTF-8", lex_tokcstr (lexer),
+                                              -1);
 		    type = VAL_STRING;
 		  }
 		else if (lex_is_number (lexer))
@@ -640,7 +638,8 @@ parse_aggregate_functions (struct lexer *lexer, const struct dictionary *dict,
 
 	    free (dest[i]);
 	    if (dest_label[i])
-              var_set_label (destvar, dest_label[i]);
+              var_set_label (destvar, dest_label[i],
+                             dict_get_encoding (agr->dict), true);
 
 	    v->dest = destvar;
 	  }
@@ -811,6 +810,7 @@ accumulate_aggregate_info (struct agr_proc *agr, const struct ccase *input)
 	    iter->int1 = 1;
 	    break;
 	  case MAX | FSTRING:
+            /* Need to do some kind of Unicode collation thingy here */
 	    if (memcmp (iter->string, value_str (v, src_width), src_width) < 0)
 	      memcpy (iter->string, value_str (v, src_width), src_width);
 	    iter->int1 = 1;