From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sat, 23 Apr 2011 05:10:04 +0000 (-0700)
Subject: ascii: Don't print command names in output.
X-Git-Tag: v0.7.8~51
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d70eff1e5dcd89a73f09ce6bc999ccbec8234b5;p=pspp-builds.git

ascii: Don't print command names in output.

This seems to be closer to what users expect.

I think that having the command names in output was being confused
by users with SET PRINTBACK=ON (see e.g. bug #31561) even though I
really just added that so that there are clear titles for the output
that goes with each procedure.  This change should help, I think.

It might make sense to make drivers only print the titles of
procedures that have other output, but this commit doesn't do that.
---

diff --git a/src/output/ascii.c b/src/output/ascii.c
index 93e79e2e..1c3e6b82 100644
--- a/src/output/ascii.c
+++ b/src/output/ascii.c
@@ -543,6 +543,7 @@ ascii_submit (struct output_driver *driver,
           a->subtitle = xstrdup (text);
           break;
 
+        case TEXT_ITEM_COMMAND_OPEN:
         case TEXT_ITEM_COMMAND_CLOSE:
           break;
 
diff --git a/tests/language/stats/frequencies.at b/tests/language/stats/frequencies.at
index 86cfd6e5..9eae09e8 100644
--- a/tests/language/stats/frequencies.at
+++ b/tests/language/stats/frequencies.at
@@ -130,9 +130,7 @@ frequencies /x /format=notable /statistics=none
 ])
 # Cannot use the CSV driver for this because it does not output charts
 # at all.
-AT_CHECK([pspp frequencies.sps], [0],
-  [DATA LIST
-
+AT_CHECK([pspp frequencies.sps], [0], [dnl
 Reading free-form data from INLINE.
 +--------+------+
 |Variable|Format|
@@ -140,12 +138,6 @@ Reading free-form data from INLINE.
 |x       |F8.0  |
 |w       |F8.0  |
 +--------+------+
-
-BEGIN DATA
-
-WEIGHT
-
-FREQUENCIES
 ])
 AT_CLEANUP
 
diff --git a/tests/output/render.at b/tests/output/render.at
index 471aefcf..9821348a 100644
--- a/tests/output/render.at
+++ b/tests/output/render.at
@@ -1796,12 +1796,6 @@ END DATA.
 LIST.
 ])
 AT_CHECK([pspp list.sps], [0], [dnl
-DATA LIST
-
-BEGIN DATA
-
-LIST
-
 Data List
 x y z
 -----