Update query attributes in WS calls.

diff --git a/org.glite.lb.server/src/ws_typemap.h b/org.glite.lb.server/src/ws_typemap.h
index 45f87d4..f42fa73 100644 (file)
--- a/org.glite.lb.server/src/ws_typemap.h
+++ b/org.glite.lb.server/src/ws_typemap.h
@@ -25,7 +25,7 @@
 #define JDLATTR                lbt__queryAttr__JDLATTR
 #define STATEENTERTIME lbt__queryAttr__STATEENTERTIME
 #define LASTUPDATETIME lbt__queryAttr__LASTUPDATETIME
-
+#define NETWORKSERVER  lbt__queryAttr__NETWORKSERVER
 
 #define EQUAL          lbt__queryOp__EQUAL
 #define UNEQUAL                lbt__queryOp__UNEQUAL

diff --git a/org.glite.lb.server/src/ws_typeref.c.T b/org.glite.lb.server/src/ws_typeref.c.T
index 91743b0..9eaa269 100644 (file)
--- a/org.glite.lb.server/src/ws_typeref.c.T
+++ b/org.glite.lb.server/src/ws_typeref.c.T
@@ -349,7 +349,7 @@ int edg_wll_JobStatFlagsToSoap(struct soap *soap, const int in, struct lbt__jobF
 
 int edg_wll_SoapToAttr(const enum lbt__queryAttr in, edg_wll_QueryAttr *out)
 {
-       assert(EDG_WLL_QUERY_ATTR_EXITCODE + 1 == EDG_WLL_QUERY_ATTR__LAST);
+       assert(EDG_WLL_QUERY_ATTR_NETWORK_SERVER + 1 == EDG_WLL_QUERY_ATTR__LAST);
 
        switch ( in )
        {
@@ -361,7 +361,7 @@ int edg_wll_SoapToAttr(const enum lbt__queryAttr in, edg_wll_QueryAttr *out)
        case DONECODE: *out = EDG_WLL_QUERY_ATTR_DONECODE; break;
        case USERTAG: *out = EDG_WLL_QUERY_ATTR_USERTAG; break;
        case TIME: *out = EDG_WLL_QUERY_ATTR_TIME; break;
-//     case LEVEL: *out = EDG_WLL_QUERY_ATTR_LEVEL; break;
+       case LEVEL: *out = EDG_WLL_QUERY_ATTR_LEVEL; break;
        case HOST: *out = EDG_WLL_QUERY_ATTR_HOST; break;
        case SOURCE: *out = EDG_WLL_QUERY_ATTR_SOURCE; break;
        case INSTANCE: *out = EDG_WLL_QUERY_ATTR_INSTANCE; break;
@@ -373,6 +373,7 @@ int edg_wll_SoapToAttr(const enum lbt__queryAttr in, edg_wll_QueryAttr *out)
        case JDLATTR: *out = EDG_WLL_QUERY_ATTR_JDL_ATTR; break;
        case STATEENTERTIME: *out = EDG_WLL_QUERY_ATTR_STATEENTERTIME; break;
        case LASTUPDATETIME: *out = EDG_WLL_QUERY_ATTR_LASTUPDATETIME; break;
+       case NETWORKSERVER: *out = EDG_WLL_QUERY_ATTR_NETWORK_SERVER; break;
        default: return 0;
        }
 
@@ -381,7 +382,7 @@ int edg_wll_SoapToAttr(const enum lbt__queryAttr in, edg_wll_QueryAttr *out)
 
 int edg_wll_AttrToSoap(const edg_wll_QueryAttr in, enum lbt__queryAttr *out)
 {
-       assert(EDG_WLL_QUERY_ATTR_EXITCODE + 1 == EDG_WLL_QUERY_ATTR__LAST);
+       assert(EDG_WLL_QUERY_ATTR_NETWORK_SERVER + 1 == EDG_WLL_QUERY_ATTR__LAST);
 
        switch ( in )
        {
@@ -393,7 +394,7 @@ int edg_wll_AttrToSoap(const edg_wll_QueryAttr in, enum lbt__queryAttr *out)
        case EDG_WLL_QUERY_ATTR_DONECODE: *out = DONECODE; break;
        case EDG_WLL_QUERY_ATTR_USERTAG: *out = USERTAG; break;
        case EDG_WLL_QUERY_ATTR_TIME: *out = TIME; break;
-//     case EDG_WLL_QUERY_ATTR_LEVEL: *out = LEVEL; break;
+       case EDG_WLL_QUERY_ATTR_LEVEL: *out = LEVEL; break;
        case EDG_WLL_QUERY_ATTR_HOST: *out = HOST; break;
        case EDG_WLL_QUERY_ATTR_SOURCE: *out = SOURCE; break;
        case EDG_WLL_QUERY_ATTR_INSTANCE: *out = INSTANCE; break;
@@ -405,6 +406,7 @@ int edg_wll_AttrToSoap(const edg_wll_QueryAttr in, enum lbt__queryAttr *out)
        case EDG_WLL_QUERY_ATTR_JDL_ATTR: *out = JDLATTR; break;
        case EDG_WLL_QUERY_ATTR_STATEENTERTIME: *out = STATEENTERTIME; break;
        case EDG_WLL_QUERY_ATTR_LASTUPDATETIME: *out = LASTUPDATETIME; break;
+       case EDG_WLL_QUERY_ATTR_NETWORK_SERVER: *out = NETWORKSERVER; break;
        default: return 0;
        }
 

diff --git a/org.glite.lb.ws-interface/src/LBTypes.xml.T b/org.glite.lb.ws-interface/src/LBTypes.xml.T
index 3dc8f76..8a594f4 100644 (file)
--- a/org.glite.lb.ws-interface/src/LBTypes.xml.T
+++ b/org.glite.lb.ws-interface/src/LBTypes.xml.T
@@ -260,6 +260,7 @@
                        <val name="DONECODE">How the job terminated (see doneCode type)</val>
                        <val name="USERTAG">Value of particular user tag. The tag name has to be specified in queryConditions.tagName.</val>
                        <val name="TIME">When the job entered a particular state. The state has to be specified in queryCondition.statName.</val>
+                       <val name="LEVEL">Logging level (see "dglog.h"), see _edg_wll_QueryRec</val>
                        <val name="RESUBMITTED">The job was resubmitted.</val>
                        <val name="PARENT">JobId of the job parend (DAG).</val>
                        <val name="EXITCODE">UNIX exit code of the job.</val>
@@ -271,6 +272,7 @@
                        <val name="JDLATTR">JDL Attribute.</val>
                        <val name="STATEENTERTIME">Staus enter time.</val>
                        <val name="LASTUPDATETIME">Last update time.</val>
+                       <val name="NETWORKSERVER">Network server aka RB aka WMproxy endpoint</val>
                </enum>
 
                <struct name="queryRecord">