From f2ccb1b5f0ad814c1e6fcbc8f1ecaa62913b7e53 Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@gnu.org>
Date: Sun, 26 Aug 2007 18:26:29 +0000
Subject: [PATCH] Send error message to non-screen output devices also, if
 routing to listing files is enabled.  Bug #17238.  Thanks to John Darrington
 for review.

* command/aggregate.sh: Update output to include error messages,
which are now sent to output files also.

* devices: Change raw-ascii from screen to listing device (because
that's how it's used).
---
 config/ChangeLog           |  5 +++++
 config/devices             |  2 +-
 src/ui/terminal/ChangeLog  |  6 ++++++
 src/ui/terminal/msg-ui.c   | 12 ++++++++++++
 tests/ChangeLog            |  7 +++++++
 tests/command/aggregate.sh | 10 +++++++++-
 tests/command/rank.sh      |  7 +++++++
 7 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/config/ChangeLog b/config/ChangeLog
index b865ad2d08..93c9e80967 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-26  Ben Pfaff  <blp@gnu.org>
+
+	* devices: Change raw-ascii from screen to listing device (because
+	that's how it's used).
+
 2007-07-25  Ben Pfaff  <blp@gnu.org>
 
 	* devices: Add tty and listing devices that use VT100 (and xterm)
diff --git a/config/devices b/config/devices
index 32d51befd6..7da8eac81a 100644
--- a/config/devices
+++ b/config/devices
@@ -53,7 +53,7 @@ tty-ascii:ascii:screen:squeeze=on headers=off top-margin=0 bottom-margin=0 \
   paginate=off length=${viewlength} width=${viewwidth} \
   output-file=${tty-output-file}
 list-ascii:ascii:listing:length=66 width=79 output-file=${list-output-file}
-raw-ascii:ascii:screen:width=9999 length=9999 output-file=${list-output-file} \
+raw-ascii:ascii:listing:width=9999 length=9999 output-file=${list-output-file} \
   emphasis=none headers=off paginate=off squeeze=on \
   top-margin=0 bottom-margin=0
 
diff --git a/src/ui/terminal/ChangeLog b/src/ui/terminal/ChangeLog
index 079aee789c..b3063bd281 100644
--- a/src/ui/terminal/ChangeLog
+++ b/src/ui/terminal/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-26  Ben Pfaff  <blp@gnu.org>
+
+	* msg-ui.c (handle_msg): Send error message to non-screen output
+	devices also, if routing to listing files is enabled.  Bug
+	#17238.  Thanks to John Darrington for review.
+
 2007-08-23  Ben Pfaff  <blp@gnu.org>
 
 	Implement journaling.  Bug #17240.
diff --git a/src/ui/terminal/msg-ui.c b/src/ui/terminal/msg-ui.c
index b51a3e5570..93c3683f22 100644
--- a/src/ui/terminal/msg-ui.c
+++ b/src/ui/terminal/msg-ui.c
@@ -26,6 +26,8 @@
 #include <libpspp/message.h>
 #include <libpspp/str.h>
 #include <output/journal.h>
+#include <output/output.h>
+#include <output/table.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -177,6 +179,16 @@ handle_msg (const struct msg *m)
 
   dump_message (ds_cstr (&string), 78, 0, write_journal, NULL);
 
+  if (get_error_routing_to_listing ())
+    {
+      /* Disable screen output devices, because the error should
+         already have been reported to the screen with the
+         dump_message call above. */
+      outp_enable_device (false, OUTP_DEV_SCREEN);
+      tab_output_text (TAB_LEFT, ds_cstr (&string));
+      outp_enable_device (true, OUTP_DEV_SCREEN);
+    }
+
   ds_destroy (&string);
 }
 
diff --git a/tests/ChangeLog b/tests/ChangeLog
index dc2c7f983c..6c378de604 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,10 @@
+2007-08-26  Ben Pfaff  <blp@gnu.org>
+
+	* command/aggregate.sh: Update output to include error messages,
+	which are now sent to output files also.
+
+	* command/ranks.h: Ditto.
+
 2007-08-12  Ben Pfaff  <blp@gnu.org>
 
 	* command/no_case_size.sh: Update to match update DISPLAY and
diff --git a/tests/command/aggregate.sh b/tests/command/aggregate.sh
index 3cdd84dbe7..b95401818a 100755
--- a/tests/command/aggregate.sh
+++ b/tests/command/aggregate.sh
@@ -150,6 +150,10 @@ EOF
 
 activity="expected output (itemwise missing) create"
 cat > agg-itemwise.out <<EOF
+warning: AGGREGATE: The value arguments passed to the FOUT function are out-of-order.  They will be treated as if they had been specified in the correct order.
+warning: AGGREGATE: The value arguments passed to the FOUT function are out-of-order.  They will be treated as if they had been specified in the correct order.
+warning: AGGREGATE: The value arguments passed to the FOUT function are out-of-order.  They will be treated as if they had been specified in the correct order.
+warning: AGGREGATE: The value arguments passed to the FOUT function are out-of-order.  They will be treated as if they had been specified in the correct order.
 G        N       NI      NU     NUI NFGT2 NFGT2I SFGT2 SFGT2I NFIN23 NFIN23I SFIN23 SFIN23I NFLT2 NFLT2I SFLT2 SFLT2I NFIRST NFIRSTI SFIRST SFIRSTI NFOUT23 NFOUT23I SFOUT23 SFOUT23I NLAST NLASTI SLAST SLASTI NMAX NMAXI SMAX SMAXI    NMEAN   NMEANI NMIN NMINI SMIN SMINI       NN      NNI       SN      SNI   NNMISS  NNMISSI   SNMISS  SNMISSI     NNU    NNUI     SNU    SNUI NNUMISS NNUMISSI SNUMISS SNUMISSI NPGT2 NPGT2I SPGT2 SPGT2I NPIN23 NPIN23I SPIN23 SPIN23I NPLT2 NPLT2I SPLT2 SPLT2I NPOUT23 NPOUT23I SPOUT23 SPOUT23I      NSD     NSDI     NSUM    NSUMI
 - -------- -------- ------- ------- ----- ------ ----- ------ ------ ------- ------ ------- ----- ------ ----- ------ ------ ------- ------ ------- ------- -------- ------- -------- ----- ------ ----- ------ ---- ----- ---- ----- -------- -------- ---- ----- ---- ----- -------- -------- -------- -------- -------- -------- -------- -------- ------- ------- ------- ------- ------- -------- ------- -------- ----- ------ ----- ------ ------ ------- ------ ------- ----- ------ ----- ------ ------- -------- ------- -------- -------- -------- -------- --------
 1     7.00     7.00       6       6  .333   .429  .333   .429   .333    .286   .333    .286  .500   .429  .500   .429      0       0      0       0    .667     .714    .667     .714     5      5     5      5    5     5    5     5     2.00     2.29    0     0    0     0     6.00     7.00     6.00     7.00     1.00      .00     1.00      .00       5       6       5       6       1        0       1        0  33.3   42.9  33.3   42.9   33.3    28.6   33.3    28.6  50.0   42.9  50.0   42.9    66.7     71.4    66.7     71.4     1.79     1.80    12.00    16.00 
@@ -160,6 +164,10 @@ EOF
 
 activity="expected output (columnwise missing) create"
 cat > agg-columnwise.out <<EOF
+warning: AGGREGATE: The value arguments passed to the FOUT function are out-of-order.  They will be treated as if they had been specified in the correct order.
+warning: AGGREGATE: The value arguments passed to the FOUT function are out-of-order.  They will be treated as if they had been specified in the correct order.
+warning: AGGREGATE: The value arguments passed to the FOUT function are out-of-order.  They will be treated as if they had been specified in the correct order.
+warning: AGGREGATE: The value arguments passed to the FOUT function are out-of-order.  They will be treated as if they had been specified in the correct order.
 G        N       NI      NU     NUI NFGT2 NFGT2I SFGT2 SFGT2I NFIN23 NFIN23I SFIN23 SFIN23I NFLT2 NFLT2I SFLT2 SFLT2I NFIRST NFIRSTI SFIRST SFIRSTI NFOUT23 NFOUT23I SFOUT23 SFOUT23I NLAST NLASTI SLAST SLASTI NMAX NMAXI SMAX SMAXI    NMEAN   NMEANI NMIN NMINI SMIN SMINI       NN      NNI       SN      SNI   NNMISS  NNMISSI   SNMISS  SNMISSI     NNU    NNUI     SNU    SNUI NNUMISS NNUMISSI SNUMISS SNUMISSI NPGT2 NPGT2I SPGT2 SPGT2I NPIN23 NPIN23I SPIN23 SPIN23I NPLT2 NPLT2I SPLT2 SPLT2I NPOUT23 NPOUT23I SPOUT23 SPOUT23I      NSD     NSDI     NSUM    NSUMI
 - -------- -------- ------- ------- ----- ------ ----- ------ ------ ------- ------ ------- ----- ------ ----- ------ ------ ------- ------ ------- ------- -------- ------- -------- ----- ------ ----- ------ ---- ----- ---- ----- -------- -------- ---- ----- ---- ----- -------- -------- -------- -------- -------- -------- -------- -------- ------- ------- ------- ------- ------- -------- ------- -------- ----- ------ ----- ------ ------ ------- ------ ------- ----- ------ ----- ------ ------- -------- ------- -------- -------- -------- -------- --------
 1     7.00     7.00       6       6  .      .429  .      .429   .       .286   .       .286  .      .429  .      .429      .       0              0    .        .714    .        .714     .      5            5    .     5          5      .       2.29    .     0          0     6.00     7.00     6.00     7.00     1.00      .00     1.00      .00       5       6       5       6       1        0       1        0    .    42.9    .    42.9     .     28.6     .     28.6    .    42.9    .    42.9      .      71.4      .      71.4      .       1.80      .      16.00 
@@ -210,7 +218,7 @@ for outfile in scratch active external; do
 	    if [ $? -ne 0 ] ; then no_result ; fi
 
 	    activity="check $name output"
-	    perl -pi -e 's/^\s*$//g' pspp.list agg-$missing.out
+	    perl -pi -e 's/^\s*$//g;s/^.*:\d+: //;' pspp.list agg-$missing.out
 	    diff -b -w pspp.list agg-$missing.out
 	    if [ $? -ne 0 ] ; then fail ; fi
 	done
diff --git a/tests/command/rank.sh b/tests/command/rank.sh
index bd0d5a2f4b..6b8760e6e2 100755
--- a/tests/command/rank.sh
+++ b/tests/command/rank.sh
@@ -587,6 +587,13 @@ if [ $? -ne 0 ] ; then fail ; fi
 activity="compare output 4"
 perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
 diff  -b $TEMPDIR/pspp.list - << EOF
+$TEMPDIR/rank.sh.sps:3: warning: BEGIN DATA: Missing value(s) for all variables from rx onward.  These will be filled with the system-missing value or blanks, as appropriate.
+$TEMPDIR/rank.sh.sps:4: warning: BEGIN DATA: Missing value(s) for all variables from rx onward.  These will be filled with the system-missing value or blanks, as appropriate.
+$TEMPDIR/rank.sh.sps:5: warning: BEGIN DATA: Missing value(s) for all variables from rx onward.  These will be filled with the system-missing value or blanks, as appropriate.
+$TEMPDIR/rank.sh.sps:6: warning: BEGIN DATA: Missing value(s) for all variables from rx onward.  These will be filled with the system-missing value or blanks, as appropriate.
+$TEMPDIR/rank.sh.sps:7: warning: BEGIN DATA: Missing value(s) for all variables from rx onward.  These will be filled with the system-missing value or blanks, as appropriate.
+$TEMPDIR/rank.sh.sps:8: warning: BEGIN DATA: Missing value(s) for all variables from rx onward.  These will be filled with the system-missing value or blanks, as appropriate.
+$TEMPDIR/rank.sh.sps:9: warning: BEGIN DATA: Missing value(s) for all variables from rx onward.  These will be filled with the system-missing value or blanks, as appropriate.
 Variables Created By RANK
 x into RNKRA01(RANK of x)
        x       rx   RNKRA01
-- 
2.30.2