added subjobs (children) attribute

diff --git a/org.glite.lb.server/interface/job-attrs.xsd b/org.glite.lb.server/interface/job-attrs.xsd
index b5c5915..8b0db69 100644 (file)
--- a/org.glite.lb.server/interface/job-attrs.xsd
+++ b/org.glite.lb.server/interface/job-attrs.xsd
@@ -55,6 +55,11 @@
                </xs:sequence>
        </xs:complexType>
 
+       <xs:complexType name="jobIdSequenceType">
+               <xs:sequence>
+                       <xs:element name="jobId" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+               </xs:sequence>
+       </xs:complexType>
 
 
 
@@ -99,6 +104,7 @@
 
        <xs:element name="jobType" type="a:jobTypeType" />
        <xs:element name="nsubjobs" type="xs:int" />
+       <xs:element name="subjobs" type="a:jobIdSequenceType" />
 
        <!-- timestamps of the state history of the last resubmission cycle,
                i.e. it is guaranteed that each state apears here only once.

diff --git a/org.glite.lb.server/interface/job-record.xsd b/org.glite.lb.server/interface/job-record.xsd
index 7d98e4b..43b0bab 100644 (file)
--- a/org.glite.lb.server/interface/job-record.xsd
+++ b/org.glite.lb.server/interface/job-record.xsd
@@ -18,6 +18,7 @@
 
                        <xs:element ref="a:jobId" minOccurs="1" maxOccurs="1"/>
                        <xs:element ref="a:user" minOccurs="1" maxOccurs="1"/>
+                       <xs:element ref="a:parent" minOccurs="0" maxOccurs="1"/>
 
        <!-- the following 6 elements have to be retrieved from JDL -->
                        <xs:element ref="a:VO" minOccurs="0" maxOccurs="1"/>
@@ -51,6 +52,7 @@
 
                        <xs:element ref="a:jobType" minOccurs="1" maxOccurs="1"/>
                        <xs:element ref="a:nsubjobs" minOccurs="0" maxOccurs="1"/>
+                       <xs:element ref="a:subjobs" minOccurs="0" maxOccurs="1"/>
 
                        <!-- timestamps of the state history of the last resubmission cycle,
                                i.e. it is guaranteed that each state apears here only once.
@@ -60,6 +62,8 @@
 
                        <!-- timestamps of the whole state history, including all resubmission cycles -->
                        <xs:element ref="a:fullStatusHistory" minOccurs="1" maxOccurs="1"/>
+
+                       <xs:element ref="a:JDL" minOccurs="0" maxOccurs="1"/>
                </xs:sequence>
 
                <!-- No idea where to get these from:

diff --git a/org.glite.lb.server/src/lb_plugin.c b/org.glite.lb.server/src/lb_plugin.c
index f6e6a10..967e901 100644 (file)
--- a/org.glite.lb.server/src/lb_plugin.c
+++ b/org.glite.lb.server/src/lb_plugin.c
@@ -479,6 +479,16 @@ static int lb_query(void *fpctx,void *handle,const char *attr,glite_jp_attrval_t
                trio_asprintf(&av[0].value,"%d", h->status.children_num);
                av[0].size = -1;
                av[0].timestamp = h->status.lastUpdateTime.tv_sec;
+       } else if (strcmp(attr, GLITE_JP_LB_subjobs) == 0) {
+               if (h->status.children_num > 0) {
+                       av = calloc(1+h->status.children_num, sizeof(glite_jp_attrval_t));
+                       for (i=0; i<h->status.children_num; i++) {
+                               av[i].name = strdup(attr);
+                               av[i].value = check_strdup(h->status.children[i]);
+                               av[i].size = -1;
+                               av[i].timestamp = h->status.lastUpdateTime.tv_sec;
+                       }
+               }
        } else if (strcmp(attr, GLITE_JP_LB_lastStatusHistory) == 0) {
 /*
                av = calloc(1 + EDG_WLL_NUMBER_OF_STATCODES, sizeof(glite_jp_attrval_t));
@@ -495,25 +505,22 @@ static int lb_query(void *fpctx,void *handle,const char *attr,glite_jp_attrval_t
 */
                int j;
                 i = 0; while (h->lastStatusHistory[i]) i++;
-                av = calloc(i+2, sizeof(glite_jp_attrval_t));
-                av[0].name = strdup(attr);
-                av[0].value = check_strdup(h->status.reason);
-                av[0].timestamp = h->status.stateEnterTime.tv_sec;
-                av[0].size = -1;
                if ((h->fullStatusHistory[0] && 
                     (h->fullStatusHistory[0]->state == EDG_WLL_JOB_SUBMITTED)) ) {
-                       av[1].name = edg_wll_StatToString(h->fullStatusHistory[0]->state);
-                       av[1].value = check_strdup(h->fullStatusHistory[0]->reason);
-                       av[1].timestamp = h->fullStatusHistory[0]->timestamp.tv_sec;
-                       av[1].size = -1;        
-                       j = 2;
-               } else {
+                       av = calloc(i+2, sizeof(glite_jp_attrval_t));
+                       av[0].name = strdup(attr);
+                       av[0].value = edg_wll_StatToString(h->fullStatusHistory[0]->state);
+                       av[0].timestamp = h->fullStatusHistory[0]->timestamp.tv_sec;
+                       av[0].size = -1;        
                        j = 1;
+               } else {
+                       av = calloc(i+1, sizeof(glite_jp_attrval_t));
+                       j = 0;
                }
                 i = 0;
                 while (h->lastStatusHistory[i]) {
-                        av[j].name = edg_wll_StatToString(h->lastStatusHistory[i]->state);
-                        av[j].value = check_strdup(h->lastStatusHistory[i]->reason);
+                       av[j].name = strdup(attr);
+                       av[j].value = edg_wll_StatToString(h->lastStatusHistory[i]->state);
                         av[j].timestamp = h->lastStatusHistory[i]->timestamp.tv_sec;
                         av[j].size = -1;
                         i++;
@@ -522,16 +529,12 @@ static int lb_query(void *fpctx,void *handle,const char *attr,glite_jp_attrval_t
        } else if (strcmp(attr, GLITE_JP_LB_fullStatusHistory) == 0) {
                i = 0; while (h->fullStatusHistory[i]) i++;
                av = calloc(i+1, sizeof(glite_jp_attrval_t));
-               av[0].name = strdup(attr);
-               av[0].value = check_strdup(h->status.reason);
-               av[0].timestamp = h->status.stateEnterTime.tv_sec;
-               av[0].size = -1;
                i = 0;
                while (h->fullStatusHistory[i]) {
-                       av[i+1].name = edg_wll_StatToString(h->fullStatusHistory[i]->state);
-                       av[i+1].value = check_strdup(h->fullStatusHistory[i]->reason);
-                       av[i+1].timestamp = h->fullStatusHistory[i]->timestamp.tv_sec;
-                       av[i+1].size = -1;      
+                       av[i].name = strdup(attr);
+                       av[i].value = edg_wll_StatToString(h->fullStatusHistory[i]->state);
+                       av[i].timestamp = h->fullStatusHistory[i]->timestamp.tv_sec;
+                       av[i].size = -1;        
                        i++;
                }
        } else if (strncmp(attr, GLITE_JP_LBTAG_NS, sizeof(GLITE_JP_LBTAG_NS)-1) == 0) {