[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] pspp config/ChangeLog config/devices src/ui/ter...
|
From: |
Ben Pfaff |
|
Subject: |
[Pspp-cvs] pspp config/ChangeLog config/devices src/ui/ter... |
|
Date: |
Sun, 26 Aug 2007 18:26:29 +0000 |
CVSROOT: /cvsroot/pspp
Module name: pspp
Changes by: Ben Pfaff <blp> 07/08/26 18:26:29
Modified files:
config : ChangeLog devices
src/ui/terminal: ChangeLog msg-ui.c
tests : ChangeLog
tests/command : aggregate.sh rank.sh
Log message:
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).
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/config/ChangeLog?cvsroot=pspp&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/pspp/config/devices?cvsroot=pspp&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/terminal/ChangeLog?cvsroot=pspp&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/terminal/msg-ui.c?cvsroot=pspp&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/ChangeLog?cvsroot=pspp&r1=1.104&r2=1.105
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/command/aggregate.sh?cvsroot=pspp&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/command/rank.sh?cvsroot=pspp&r1=1.6&r2=1.7
Patches:
Index: config/ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/config/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- config/ChangeLog 27 Jul 2007 22:59:32 -0000 1.7
+++ config/ChangeLog 26 Aug 2007 18:26:29 -0000 1.8
@@ -1,3 +1,8 @@
+2007-08-26 Ben Pfaff <address@hidden>
+
+ * devices: Change raw-ascii from screen to listing device (because
+ that's how it's used).
+
2007-07-25 Ben Pfaff <address@hidden>
* devices: Add tty and listing devices that use VT100 (and xterm)
Index: config/devices
===================================================================
RCS file: /cvsroot/pspp/pspp/config/devices,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- config/devices 27 Jul 2007 22:59:32 -0000 1.8
+++ config/devices 26 Aug 2007 18:26:29 -0000 1.9
@@ -53,7 +53,7 @@
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
Index: src/ui/terminal/ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/ui/terminal/ChangeLog,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- src/ui/terminal/ChangeLog 24 Aug 2007 05:00:51 -0000 1.25
+++ src/ui/terminal/ChangeLog 26 Aug 2007 18:26:29 -0000 1.26
@@ -1,3 +1,9 @@
+2007-08-26 Ben Pfaff <address@hidden>
+
+ * 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 <address@hidden>
Implement journaling. Bug #17240.
Index: src/ui/terminal/msg-ui.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/ui/terminal/msg-ui.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- src/ui/terminal/msg-ui.c 24 Aug 2007 05:00:51 -0000 1.14
+++ src/ui/terminal/msg-ui.c 26 Aug 2007 18:26:29 -0000 1.15
@@ -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 @@
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);
}
Index: tests/ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/tests/ChangeLog,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -b -r1.104 -r1.105
--- tests/ChangeLog 13 Aug 2007 04:50:29 -0000 1.104
+++ tests/ChangeLog 26 Aug 2007 18:26:29 -0000 1.105
@@ -1,3 +1,10 @@
+2007-08-26 Ben Pfaff <address@hidden>
+
+ * 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 <address@hidden>
* command/no_case_size.sh: Update to match update DISPLAY and
Index: tests/command/aggregate.sh
===================================================================
RCS file: /cvsroot/pspp/pspp/tests/command/aggregate.sh,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- tests/command/aggregate.sh 7 Nov 2006 13:00:00 -0000 1.17
+++ tests/command/aggregate.sh 26 Aug 2007 18:26:29 -0000 1.18
@@ -150,6 +150,10 @@
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 @@
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 @@
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
Index: tests/command/rank.sh
===================================================================
RCS file: /cvsroot/pspp/pspp/tests/command/rank.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- tests/command/rank.sh 13 Aug 2007 04:50:29 -0000 1.6
+++ tests/command/rank.sh 26 Aug 2007 18:26:29 -0000 1.7
@@ -587,6 +587,13 @@
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
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pspp-cvs] pspp config/ChangeLog config/devices src/ui/ter...,
Ben Pfaff <=