pullup of INFN CVS changes -- mainly notifications

diff --git a/org.glite.lb.common/interface/context-int.h b/org.glite.lb.common/interface/context-int.h
index 4fb9381..d9db7e2 100644 (file)
--- a/org.glite.lb.common/interface/context-int.h
+++ b/org.glite.lb.common/interface/context-int.h
@@ -44,6 +44,7 @@ struct _edg_wll_Context {
 
        void            *mysql;
        edg_wll_ConnPool        *connPool;
+       edg_wll_ConnPool        *connPoolNotif;         /* hold _one_ connection from notif-interlogger */
 
        int             semaphores,semset;
        edg_wll_QueryRec        **job_index;
@@ -86,6 +87,9 @@ struct _edg_wll_Context {
        int             connOpened;     /* number of opened connections  */
        int             connToUse;      /* index of connection that will *
                                         *  be used by low-level f-cions */
+       // XXX similar variables will be needed for connPoolNotif
+
+       
 /* other client stuff */
        int             notifSock;              /* default client socket        *
                                                 * for receiving notifications  */   

diff --git a/org.glite.lb.common/project/version.properties b/org.glite.lb.common/project/version.properties
index c183c88..c072c74 100644 (file)
--- a/org.glite.lb.common/project/version.properties
+++ b/org.glite.lb.common/project/version.properties
@@ -1,4 +1,4 @@
 #Thu Oct 07 13:51:56 CEST 2004
-module.version=0.1.0
+module.version=0.2.0
 module.build=33
 module.age=0

diff --git a/org.glite.lb.common/src/context.c b/org.glite.lb.common/src/context.c
index ed68244..73eafa1 100644 (file)
--- a/org.glite.lb.common/src/context.c
+++ b/org.glite.lb.common/src/context.c
@@ -31,6 +31,7 @@ int edg_wll_InitContext(edg_wll_Context *ctx)
        for (i=0; i<EDG_WLL_PARAM__LAST; i++) edg_wll_SetParam(out,i,NULL);
 
        out->connPool = (edg_wll_ConnPool *) calloc(out->poolSize, sizeof(edg_wll_ConnPool));
+       out->connPoolNotif = (edg_wll_ConnPool *) calloc(1, sizeof(edg_wll_ConnPool));
 
        *ctx = out;
        return 0;
@@ -96,12 +97,12 @@ static const char* const errTexts[] = {
        "Bad URL format",
        "MD5 key clash",
        "GSSAPI Error",
-       "DNS resolver error",
        "No JobId specified in context",
        "No indexed condition in query",
        "Interlogger protocol error",
        "Interlogger internal error",
        "Interlogger has events pending"
+       "DNS resolver error",
 };
 
 const char *edg_wll_GetErrorText(int code) {

diff --git a/org.glite.lb.common/src/xml_parse.c.T b/org.glite.lb.common/src/xml_parse.c.T
index e3fb8d8..fec866d 100644 (file)
--- a/org.glite.lb.common/src/xml_parse.c.T
+++ b/org.glite.lb.common/src/xml_parse.c.T
@@ -2591,7 +2591,7 @@ int edg_wll_NotifRequestToXML(
        pomA = strdup("");
        edg_wll_add_string_to_XMLBody(&pomA, edg_wll_NotifIdUnparse(notifId), "notifId", NULL);
        edg_wll_add_string_to_XMLBody(&pomA, address, "clientAddress", NULL);
-       edg_wll_add_int_to_XMLBody(&pomA, op, "notifChangeOp", EDG_WLL_NOTIF_NOOP);
+       edg_wll_add_string_to_XMLBody(&pomA, edg_wll_NotifChangeOpToString(op), "notifChangeOp", NULL);
        if (conditions && conditions[0] && conditions[0][0].attr != EDG_WLL_QUERY_ATTR_UNDEF)
                edg_wll_JobQueryRecToXML(ctx, conditions, &pomB);