MonetDB: embedded - fix for linux

[Hannes Muehleisen]

Changeset: 9afb821ed50b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9afb821ed50b
Modified Files:
        monetdb5/mal/mal_linker.c
        tools/embedded/rpackage/NAMESPACE
        tools/embedded/rpackage/R/monetdb.R
Branch: embedded
Log Message:

fix for linux


diffs (56 lines):

diff --git a/monetdb5/mal/mal_linker.c b/monetdb5/mal/mal_linker.c
--- a/monetdb5/mal/mal_linker.c
+++ b/monetdb5/mal/mal_linker.c
@@ -99,7 +99,7 @@ getAddress(stream *out, str filename, st
 
        adr = (MALfcn) dlsym(dl, fcnname);
        dlclose(dl);
-       if( adr != NULL)
+       if(adr != NULL)
                return adr; /* found it */
 
        if (!silent)
diff --git a/tools/embedded/rpackage/NAMESPACE 
b/tools/embedded/rpackage/NAMESPACE
--- a/tools/embedded/rpackage/NAMESPACE
+++ b/tools/embedded/rpackage/NAMESPACE
@@ -1,4 +1,3 @@
-useDynLib(libmonetdb5)
 export(monetdb_embedded_startup)
 export(monetdb_embedded_query)
 export(monetdb_embedded_append)
diff --git a/tools/embedded/rpackage/R/monetdb.R 
b/tools/embedded/rpackage/R/monetdb.R
--- a/tools/embedded/rpackage/R/monetdb.R
+++ b/tools/embedded/rpackage/R/monetdb.R
@@ -3,6 +3,7 @@ installdir <- ""
 
 .onLoad <- function(libname, pkgname){
        installdir <<- file.path(libname, pkgname, "libs")
+       library.dynam("libmonetdb5", pkgname, lib.loc=libname, now=T, local=F)
 }
 
 monetdb_embedded_startup <- function(dir=tempdir(), quiet=TRUE) {
@@ -17,7 +18,7 @@ monetdb_embedded_startup <- function(dir
        if (file.access(dir, mode=2) < 0) {
                stop("Cannot write to ", dir)
        }
-       res <- .Call("monetdb_startup_R", installdir, dir, quiet)
+       res <- .Call("monetdb_startup_R", installdir, dir, quiet, 
PACKAGE="libmonetdb5")
        if (is.character(res)) {
                stop("Failed to initialize embedded MonetDB ", res)
        }
@@ -38,7 +39,7 @@ monetdb_embedded_query <- function(query
        }
        # make sure the query is terminated
        query <- paste(query, "\n;", sep="")
-       res <- .Call("monetdb_query_R", query, notreally)
+       res <- .Call("monetdb_query_R", query, notreally, PACKAGE="libmonetdb5")
 
        resp <- list()
        if (is.character(res)) { # error
@@ -72,5 +73,5 @@ monetdb_embedded_append <- function(tabl
                stop("Need a data frame as tdata parameter.")
        }
 
-       .Call("monetdb_append_R", schema, table, tdata)
+       .Call("monetdb_append_R", schema, table, tdata, PACKAGE="libmonetdb5")
 }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list