MonetDB: default - mseed: no need for conditionals any more

[Fabian Groffen]

Changeset: 96500746d162 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=96500746d162
Modified Files:
        clients/src/mapiclient/mclient.c
        sql/src/backends/monet5/vaults/mseed.mx
Branch: default
Log Message:

mseed: no need for conditionals any more


diffs (53 lines):

diff -r 774170e179d2 -r 96500746d162 clients/src/mapiclient/mclient.c
--- a/clients/src/mapiclient/mclient.c  Thu Nov 25 13:06:09 2010 +0100
+++ b/clients/src/mapiclient/mclient.c  Thu Nov 25 13:10:08 2010 +0100
@@ -2124,6 +2124,7 @@
                                                                MD_SEQ,
                                                                nameq,
                                                                x);
+                                               printf("%s\n", q);
                                                hdl = mapi_query(mid, q);
                                                CHECK_RESULT(mid, hdl, buf, 
continue);
                                                while (fetch_row(hdl) == 5) {
diff -r 774170e179d2 -r 96500746d162 sql/src/backends/monet5/vaults/mseed.mx
--- a/sql/src/backends/monet5/vaults/mseed.mx   Thu Nov 25 13:06:09 2010 +0100
+++ b/sql/src/backends/monet5/vaults/mseed.mx   Thu Nov 25 13:10:08 2010 +0100
@@ -39,9 +39,7 @@
 #include "mal_client.h"
 #include "mal_interpreter.h"
 #include "mal_function.h"
-#ifdef HAVE_MSEED
 #include "libmseed.h"
-#endif
 
 #ifdef WIN32
 #ifndef LIBMSEED
@@ -72,7 +70,6 @@
 {
        str *ret = (str*) getArgReference(stk,pci,0); 
        str msg = MAL_SUCCEED;
-#ifdef HAVE_MSEED
        int *vid = (int*) getArgReference(stk,pci,1); 
        str *sourcefile = (str*) getArgReference(stk,pci,2); 
        MSRecord *msr = 0;
@@ -94,6 +91,8 @@
        char stoptime[BUFSIZ];
        int stepsize;
 
+       (void) mb;
+
        if ( vaultpath[0] == 0){
                msg= createException(MAL,"mseed.dump","Vault not initialized");
                *ret = GDKstrdup(msg);
@@ -170,11 +169,6 @@
 
        /* Make sure everything is cleaned up */
        ms_readmsr (&msr, NULL, 0, NULL, NULL, 0, 0, 0);
-#else
-       (void) cntxt;
-       throw(MAL,"mseed.dump","libmseed not available");
-#endif
-       (void) mb;
        if (msg )
                *ret= GDKstrdup(msg);
        else *ret= 0;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list