From 06bbf785c3388d1088745e3482e7e61cf4067733 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Sat, 18 Jul 2015 09:59:32 +0200 Subject: [PATCH] GET DATA TXT: change syntax generation from /IMPORTCASES to IMPORTCASE Apparently, spss only accepts IMPORTCASE (contrary to its documentation). Reported by: Frans Houweling --- src/ui/gui/page-intro.c | 6 +++--- tests/language/data-io/get-data-txt.at | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/ui/gui/page-intro.c b/src/ui/gui/page-intro.c index a7cda1b220..6db2bee688 100644 --- a/src/ui/gui/page-intro.c +++ b/src/ui/gui/page-intro.c @@ -186,11 +186,11 @@ void intro_append_syntax (const struct intro_page *p, struct string *s) { if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (p->n_cases_button))) - ds_put_format (s, " /IMPORTCASES=FIRST %d\n", + ds_put_format (s, " /IMPORTCASE=FIRST %d\n", gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (p->n_cases_spin))); else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (p->percent_button))) - ds_put_format (s, " /IMPORTCASES=PERCENT %d\n", + ds_put_format (s, " /IMPORTCASE=PERCENT %d\n", gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (p->percent_spin))); else - ds_put_cstr (s, " /IMPORTCASES=ALL\n"); + ds_put_cstr (s, " /IMPORTCASE=ALL\n"); } diff --git a/tests/language/data-io/get-data-txt.at b/tests/language/data-io/get-data-txt.at index f18fc978f8..60409df37e 100644 --- a/tests/language/data-io/get-data-txt.at +++ b/tests/language/data-io/get-data-txt.at @@ -286,7 +286,7 @@ Gilly ,. ,White,10.04.2007,10.00,"3"" ",Guinea Pig AT_CLEANUP dnl " (fixes Emacs highlighting) -AT_SETUP([GET DATA /TYPE=TXT with IMPORTCASES]) +AT_SETUP([GET DATA /TYPE=TXT with IMPORTCASE]) AT_CHECK([$PERL > test.data <<'EOF' for ($i = 1; $i <= 100; $i++) { printf "%02d\n", $i; @@ -294,19 +294,19 @@ for ($i = 1; $i <= 100; $i++) { EOF ]) AT_DATA([get-data.sps], [dnl -get data /type=txt /file='test.data' /importcases=first 10 /variables x f8.0. +get data /type=txt /file='test.data' /importcase=first 10 /variables x f8.0. list. -get data /type=txt /file='test.data' /importcases=percent 1 /variables x f8.0. +get data /type=txt /file='test.data' /importcase=percent 1 /variables x f8.0. list. -get data /type=txt /file='test.data' /importcases=percent 35 /variables x f8.0. +get data /type=txt /file='test.data' /importcase=percent 35 /variables x f8.0. list. -get data /type=txt /file='test.data' /importcases=percent 95 /variables x f8.0. +get data /type=txt /file='test.data' /importcase=percent 95 /variables x f8.0. list. -get data /type=txt /file='test.data' /importcases=percent 100 /variables x f8.0. +get data /type=txt /file='test.data' /importcase=percent 100 /variables x f8.0. list. ]) AT_CHECK([pspp -o pspp.csv get-data.sps]) -- 2.30.2