Update of /cvsroot/monetdb/clients/src/mapiclient
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15126
Modified Files:
MapiClient.mx
Log Message:
Simplified flow of control and restored help functionality for MAL.
Index: MapiClient.mx
===================================================================
RCS file: /cvsroot/monetdb/clients/src/mapiclient/MapiClient.mx,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- MapiClient.mx 16 Aug 2007 19:07:32 -0000 1.56
+++ MapiClient.mx 17 Aug 2007 05:47:53 -0000 1.57
@@ -1024,11 +1024,9 @@
length = 0;
} else
length = strlen(line);
-
- if (length > 0 &&
- mode != MAL &&
- (hdl == NULL && length > 0 && line[length - 1] ==
'\n')) {
+ if (hdl == NULL && length > 0 && line[length - 1] == '\n') {
/* test for special commands */
+ if( mode != MAL)
while (length > 0 && (*line & ~0x7F) == 0 &&
isspace((int) *line)) {
line++;
length--;
@@ -1110,7 +1108,7 @@
SQLrenderer(hdl);
}
mapi_close_handle(hdl);
- hdl = 0;
+ hdl = NULL;
pagewidth = old;
}
continue;
@@ -1260,16 +1258,15 @@
hdl = mapi_query_prep(mid);
CHECK_RESULT(mid, hdl, buf, continue);
}
- if (length > 0 ||
- debugMode() ||
- mode == MAL || mode== MIL) {
- assert(hdl != NULL);
+ assert(hdl != NULL);
+
+ if (length > 0 ){
sent = 1;
SQLsetSpecial(line);
mapi_query_part(hdl, line, length);
CHECK_RESULT(mid, hdl, buf, continue);
}
- assert(hdl != NULL);
+
/* If the server wants more but we're at the
end of file (line == NULL), notify the
server that we don't have anything more.
-------------------------------------------------------------------------
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
