From 3c381cf7b7cad17c11de552cd7b787114eb8066d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Posp=C3=AD=C5=A1il?= Date: Tue, 13 Jun 2006 13:54:22 +0000 Subject: [PATCH] Merge from glite-lb-server_branch_1_4_0_RC31 --- org.glite.lb.server/src/lb_plugin.c | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/org.glite.lb.server/src/lb_plugin.c b/org.glite.lb.server/src/lb_plugin.c index 546212c..1dbbdfd 100644 --- a/org.glite.lb.server/src/lb_plugin.c +++ b/org.glite.lb.server/src/lb_plugin.c @@ -248,10 +248,6 @@ static int lb_query(void *fpctx,void *handle,const char *attr,glite_jp_attrval_t i++; } } - if (!av[0].value) { - av[0].value = "UNKNOWN"; - av[0].timestamp = h->status.lastUpdateTime.tv_sec; - } } else if (strcmp(attr, GLITE_JP_LB_eNodes) == 0) { av = calloc(2, sizeof(glite_jp_attrval_t)); av[0].name = strdup(attr); @@ -277,10 +273,6 @@ static int lb_query(void *fpctx,void *handle,const char *attr,glite_jp_attrval_t i++; } } - if (!av[0].value) { - av[0].value = "UNKNOWN"; - av[0].timestamp = h->status.lastUpdateTime.tv_sec; - } } else if (strcmp(attr, GLITE_JP_LB_eProc) == 0) { av = calloc(2, sizeof(glite_jp_attrval_t)); av[0].name = strdup(attr); @@ -306,10 +298,6 @@ static int lb_query(void *fpctx,void *handle,const char *attr,glite_jp_attrval_t i++; } } - if (!av[0].value) { - av[0].value = "UNKNOWN"; - av[0].timestamp = h->status.lastUpdateTime.tv_sec; - } } else if (strcmp(attr, GLITE_JP_LB_aTag) == 0 || strcmp(attr, GLITE_JP_LB_rQType) == 0 || strcmp(attr, GLITE_JP_LB_eDuration) == 0) { @@ -405,12 +393,6 @@ static int lb_query(void *fpctx,void *handle,const char *attr,glite_jp_attrval_t i++; } } - if (!av) { - av = calloc(2, sizeof(glite_jp_attrval_t)); - av[0].name = strdup(attr); - av[0].value = "UNKNOWN"; - av[0].timestamp = h->status.lastUpdateTime.tv_sec; - } } else if (strcmp(attr, GLITE_JP_LB_retryCount) == 0) { av = calloc(2, sizeof(glite_jp_attrval_t)); av[0].name = strdup(attr); @@ -428,7 +410,14 @@ static int lb_query(void *fpctx,void *handle,const char *attr,glite_jp_attrval_t } else if (strcmp(attr, GLITE_JP_LB_jobType) == 0) { av = calloc(2, sizeof(glite_jp_attrval_t)); av[0].name = strdup(attr); - av[0].value = edg_wll_RegJobJobtypeToString(h->status.jobtype); + switch (h->status.jobtype) { + case EDG_WLL_STAT_SIMPLE: + av[0].value = strdup("SIMPLE"); break; + case EDG_WLL_STAT_DAG: + av[0].value = strdup("DAG"); break; + default: + av[0].value = strdup("UNKNOWN"); break; + } av[0].size = -1; av[0].timestamp = h->status.lastUpdateTime.tv_sec; } else if (strcmp(attr, GLITE_JP_LB_nsubjobs) == 0) { -- 1.8.2.3