Update of /cvsroot/monetdb/clients/src/mapiclient In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15798
Modified Files:
MapiClient.mx
Log Message:
Continuing the quest to sort out the interference between (MAL) modes
and help support.
Index: MapiClient.mx
===================================================================
RCS file: /cvsroot/monetdb/clients/src/mapiclient/MapiClient.mx,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- MapiClient.mx 23 Aug 2007 15:51:47 -0000 1.65
+++ MapiClient.mx 23 Aug 2007 19:21:00 -0000 1.66
@@ -785,14 +785,14 @@
return 1;
}
- if (mode == SQL && (pagewidth >= 0 ||
+ if (mode == SQL && !debugMode() && (pagewidth >= 0 ||
formatter == TABLEformatter ||
formatter == CSVformatter ||
formatter == TABformatter)) {
if (pagewidth < 0)
pagewidth = 0;
SQLrenderer(hdl);
- } else if (mode == SQL && formatter == XMLformatter)
+ } else if (mode == SQL && !debugMode() && formatter == XMLformatter)
XMLrenderer(hdl);
else
RAWrenderer(hdl);
@@ -1153,7 +1153,7 @@
mapi_error(mid) == MOK) {
if (formatter ==
XMLformatter)
XMLrenderer(hdl);
- else if (formatter ==
RAWformatter)
+ else if (debugMode() ||
formatter == RAWformatter)
RAWrenderer(hdl);
else
SQLrenderer(hdl);
@@ -1303,7 +1303,6 @@
showCommands();
continue;
}
- continue;
}
}
@@ -1388,7 +1387,7 @@
goto nononsense;
if (formatter == XMLformatter)
XMLrenderer(hdl);
- else if (formatter ==
RAWformatter)
+ else if (debugMode() ||
formatter == RAWformatter)
RAWrenderer(hdl);
else
SQLrenderer(hdl);
@@ -1407,12 +1406,13 @@
case XMLformatter:
XMLrenderer(hdl);
break;
- case RAWformatter:
- RAWrenderer(hdl);
- break;
+ case TABLEformatter:
+ if( !debugMode()){
+
SQLrenderer(hdl);
+ break;
+ }
default:
- SQLrenderer(hdl);
- break;
+ RAWrenderer(hdl);
}
break;
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
