reversed julian's patch back in again...othere things cause monitor

to not compile now...

diff --git a/src/bin/monitor/monitor.c b/src/bin/monitor/monitor.c
index 28a8cca67b1d81d6c8c5bc70b4fd99417a97a5ae..21812898d9db74a69ef7a726f7266b00677138d2 100644 (file)
--- a/src/bin/monitor/monitor.c
+++ b/src/bin/monitor/monitor.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/bin/monitor/Attic/monitor.c,v 1.3 1996/07/22 05:59:53 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/bin/monitor/Attic/monitor.c,v 1.4 1996/07/23 02:26:41 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -642,6 +642,7 @@ handle_execution(char *query)
 {
     PGresult *result;
     int retval = 0;
+    PQprintOpt opt;
     
     result = PQexec(conn, query);
 
@@ -657,11 +658,18 @@ handle_execution(char *query)
        break;
     case PGRES_TUPLES_OK:
 /*     PQprintTuples(result,stdout,PrintAttNames,TerseOutput,COLWIDTH); */
-       if (TerseOutput)
+/*     if (TerseOutput)
            PQdisplayTuples(result,stdout,1,"",PrintAttNames,TerseOutput);
        else
-           PQdisplayTuples(result,stdout,1,"|",PrintAttNames,TerseOutput);
-       break;
+           PQdisplayTuples(result,stdout,1,"|",PrintAttNames,TerseOutput); */
+        memset(&opt, 0, sizeof opt);
+        opt.header = opt.align = opt.standard = 1;
+       if (TerseOutput)
+           opt.fieldSep = "";
+       else
+           opt.fieldSep = "|";
+        PQprint(stdout, result, &opt);
+        break;
     case PGRES_COPY_OUT:
        handle_copy_out(result);
        break;