Update of /cvsroot/monetdb/clients/src/mapiclient
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv501
Modified Files:
MapiClient.mx
Log Message:
Undo Martin's checkin for the most part. Fix up the rest.
Index: MapiClient.mx
===================================================================
RCS file: /cvsroot/monetdb/clients/src/mapiclient/MapiClient.mx,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- MapiClient.mx 28 Aug 2007 08:03:57 -0000 1.74
+++ MapiClient.mx 28 Aug 2007 08:35:17 -0000 1.75
@@ -243,15 +243,6 @@
}
static void
-modeChange(char *reply){
- if (strstr(reply, "mdb>#EOD")){
- setPrompt();
- } else
- if(strncmp(reply,"mdb>",4)==0)
- sprintf(promptbuf,"mdb>");
-}
-
-static void
SQLsetSpecial(const char *command)
{
if (mode == SQL && command) {
@@ -380,7 +371,6 @@
do {
if ((reply = fetch_line(hdl)) == NULL)
return 0;
- modeChange(reply);
} while (*reply != '[' && *reply != '=');
return mapi_split_line(hdl);
}
@@ -422,8 +412,7 @@
{
char *line;
- while ((line = mapi_fetch_line(hdl)) != 0) {
- modeChange(line);
+ while ((line = fetch_line(hdl)) != 0) {
if (*line == '=')
line++;
fprintf(toConsole, "%s\n", line);
@@ -1321,7 +1310,8 @@
continue;
}
case '?':
- if (mode==MAL ||debugMode() ){
+ if (mode == MAL || debugMode()) {
+ /* send line from ? to server */
strcpy(line, line + 1);
break;
}
@@ -1767,8 +1757,7 @@
/* default formatter depends on whether we're interactive */
if (formatter == NOformatter)
- formatter = interactive && interactive_stdin && mode != XQUERY ?
- (mode==MAL?RAWformatter: TABLEformatter) : RAWformatter;
+ formatter = interactive && interactive_stdin && mode != XQUERY
&& mode != MAL ? TABLEformatter : RAWformatter;
if (command) {
/* execute from command-line */
-------------------------------------------------------------------------
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
