Update of /cvsroot/monetdb/pathfinder/src/tools
In directory sc8-pr-cvs16:/tmp/cvs-serv9407/src/tools

Modified Files:
      Tag: XQuery_0-16
        embeddedclient.mx prog.c 
Log Message:
fixes for Mbeddedxq



Index: embeddedclient.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/src/tools/embeddedclient.mx,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -u -d -r1.11.2.1 -r1.11.2.2
--- embeddedclient.mx   1 Mar 2007 18:56:45 -0000       1.11.2.1
+++ embeddedclient.mx   20 Apr 2007 13:41:52 -0000      1.11.2.2
@@ -169,7 +169,6 @@
        snprintf(buf, sizeof(buf), "client(Stream(\"" PTRFMT "\"), Stream(\"" 
PTRFMT "\"));", PTRFMTCAST in, PTRFMTCAST out);
        monet_exec("module(pathfinder);");
        monet_exec("xquery_start_query_cache(16000000LL);");
-/*      monet_exec("mapi_register(xquery_frontend());"); */
        monet_exec(buf);
        return NULL;
 }

Index: prog.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/src/tools/prog.c,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -d -r1.11 -r1.11.2.1
--- prog.c      3 Jan 2007 12:33:14 -0000       1.11
+++ prog.c      20 Apr 2007 13:41:52 -0000      1.11.2.1
@@ -16,7 +16,7 @@
  * All Rights Reserved.
  */
 
-#include "pf_config.h"
+#include "monetdb4_config.h"
 #include <monet_options.h>
 #include "embeddedclient.h"
 
@@ -101,6 +101,11 @@
        if (!(setlen = mo_builtin_settings(&set)))
                usage(prog);
 
+       /* needed, to prevent the MonetDB config file to be used */  
+       setlen = mo_add_option(&set, setlen, opt_config, "prefix", 
MONETDBPREFIX);
+       setlen = mo_add_option(&set, setlen, opt_config, "config", 
MONETDBCONFIG);
+       setlen = mo_system_config(&set, setlen);
+
        for (;;) {
                int option_index = 0;
 


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins

Reply via email to