Changeset: 4b2f0780c9af for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4b2f0780c9af
Modified Files:
        clients/src/mapiclient/mclient.mx
Branch: default
Log Message:

Add notice first time cropping/truncating occurs that tells how to disable


diffs (44 lines):

diff -r 879bb05d43cf -r 4b2f0780c9af clients/src/mapiclient/mclient.mx
--- a/clients/src/mapiclient/mclient.mx Wed Aug 18 15:13:59 2010 +0200
+++ b/clients/src/mapiclient/mclient.mx Wed Aug 18 15:54:17 2010 +0200
@@ -217,6 +217,7 @@
 static int pagewidthset = 0;   /* whether the user set the width explicitly */
 static int interactive_stdin = 0;
 static int croppedfields = 0;  /* whatever got cropped/truncated */
+static char firstcrop = 1;     /* first time we see cropping/truncation */
 
 enum modifiers {
        NOmodifier,
@@ -1271,15 +1272,28 @@
                        singleinstr ? " (" : "",
                        singleinstr ? timerHuman() : "",
                        singleinstr ? ")" : "");
+
+       if (oldfields != printfields || croppedfields > 0)
+               printf(" !");
        if (oldfields != printfields) {
                rows = oldfields - printfields;
-               printf(" !" LLFMT " column%s dropped", rows, rows != 1 ? "s" : 
"");
-               if (croppedfields > 0)
-                       printf(", %d field%s truncated",
-                                       croppedfields, croppedfields != 1 ? "s" 
: "");
+               printf(LLFMT " column%s dropped", rows, rows != 1 ? "s" : "");
+       }
+       if (oldfields != printfields && croppedfields > 0)
+               printf(", ");
+       if (croppedfields > 0)
+               printf("%d field%s truncated",
+                               croppedfields, croppedfields != 1 ? "s" : "");
+       if (oldfields != printfields || croppedfields > 0) {
                printf("!");
+               if (firstcrop == 1) {
+                       firstcrop = 0;
+                       printf("\nnote: to disable dropping columns and/or 
truncating fields use \\w-1");
+               }
        }
        printf("\n");
+
+
        if (len)
                free(len);
        if (hdr)
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to