Some DB testing, _GNU_SOURCE to better place.

diff --git a/org.glite.jp.index/Makefile b/org.glite.jp.index/Makefile
index 6acc32e..ff410f7 100644 (file)
--- a/org.glite.jp.index/Makefile
+++ b/org.glite.jp.index/Makefile
@@ -31,9 +31,10 @@ GLOBUS_LIBS:=-L${globus_prefix}/lib \
 
 GLOBUS_CFLAGS:=-I${globus_prefix}/include/${nothrflavour}
 
-DEBUG:=-W -Wall -Wno-unused-parameter -Wno-unused-function -g -O0  -DDEBUG
+CPPFLAGS:=-DDEBUG -D_GNU_SOURCE
+DEBUG:=-W -Wall -Wno-unused-parameter -Wno-unused-function -g -O0
 
-CFLAGS:=${DEBUG} -I. -I${top_srcdir}/interface -I${top_srcdir}/src -I${gsoap_prefix}/include -I${stagedir}/include ${GLOBUS_CFLAGS} -I${mysql_prefix}/include -I${mysql_prefix}/include/mysql
+CFLAGS:=${CPPFLAGS} ${DEBUG} -I. -I${top_srcdir}/interface -I${top_srcdir}/src -I${gsoap_prefix}/include -I${stagedir}/include ${GLOBUS_CFLAGS} -I${mysql_prefix}/include -I${mysql_prefix}/include/mysql
 LDFLAGS:=-L${stagedir}/lib
 
 LINK:=libtool --mode=link ${CC} ${LDFLAGS} 

diff --git a/org.glite.jp.index/examples/jpis-db-internal.c b/org.glite.jp.index/examples/jpis-db-internal.c
index cc08cbe..df0b24e 100644 (file)
--- a/org.glite.jp.index/examples/jpis-db-internal.c
+++ b/org.glite.jp.index/examples/jpis-db-internal.c
@@ -1,5 +1,3 @@
-#define _GNU_SOURCE
-
 #include <errno.h>
 #include <string.h>
 #include <stdlib.h>

diff --git a/org.glite.jp.index/src/db_ops.c b/org.glite.jp.index/src/db_ops.c
index b2a4408..402b983 100644 (file)
--- a/org.glite.jp.index/src/db_ops.c
+++ b/org.glite.jp.index/src/db_ops.c
@@ -1,7 +1,5 @@
 #ident "$Header$"
 
-#define _GNU_SOURCE
-
 #include <time.h>
 #include <errno.h>
 #include <stdlib.h>
@@ -399,11 +397,13 @@ int glite_jpis_init_context(glite_jpis_context_t *isctx, glite_jp_context_t jpct
        int ret;
        void *myparam;
        void *myres;
+       const char *cs;
 
        *isctx = calloc(sizeof(**isctx), 1);
        
        (*isctx)->jpctx = jpctx;
-       if ((ret = glite_jp_db_connect(jpctx, GLITE_JP_IS_DEFAULTCS)) != 0) goto fail;
+       if ((cs = getenv("GLITE_JPIS_DB")) == NULL) cs = GLITE_JP_IS_DEFAULTCS;
+       if ((ret = glite_jp_db_connect(jpctx, cs)) != 0) goto fail;
 
        // sql command: select an uninitialized unlocked feed
        glite_jp_db_create_results(&myres, 2,

diff --git a/org.glite.jp.index/src/soap_ops.c b/org.glite.jp.index/src/soap_ops.c
index 76a57a2..9d6f407 100644 (file)
--- a/org.glite.jp.index/src/soap_ops.c
+++ b/org.glite.jp.index/src/soap_ops.c
@@ -113,7 +113,7 @@ SOAP_FMAC5 int SOAP_FMAC6 __jpsrv__UpdateJobs(
        status = isctx->param_state;
        done = jpelem__UpdateJobs->feedDone ? GLITE_JP_IS_STATE_DONE : 0;
        if ((done != (status & GLITE_JP_IS_STATE_DONE)) && done) {
-               isctx->param_state != done;
+               isctx->param_state |= done;
                if ((ret = glite_jp_db_execute(isctx->update_state_feed_stmt)) != 1) {
                        fprintf(stderr, "can't update state of '%s', returned %d records: %s (%s)\n", feedid, ret, jpctx->error->desc, jpctx->error->source);
                        return SOAP_FAULT;