From 65ffdb50b50a6942e9a205a39a301e53ea872408 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zden=C4=9Bk=20=C5=A0ustr?= Date: Fri, 17 Aug 2012 14:26:52 +0000 Subject: [PATCH] Use enum naming arrays where applicable --- org.glite.lb.client/examples/query_ext.c | 25 +------------------ org.glite.lb.server/src/cond_dump.c | 42 +------------------------------- 2 files changed, 2 insertions(+), 65 deletions(-) diff --git a/org.glite.lb.client/examples/query_ext.c b/org.glite.lb.client/examples/query_ext.c index afc67f1..b4eee4f 100644 --- a/org.glite.lb.client/examples/query_ext.c +++ b/org.glite.lb.client/examples/query_ext.c @@ -774,30 +774,7 @@ static void printconds(edg_wll_QueryRec **cond) { if ( j ) printf(" OR "); - switch ( cond[i][j].attr ) - { - case EDG_WLL_QUERY_ATTR_JOBID: printf("jobid"); break; - case EDG_WLL_QUERY_ATTR_OWNER: printf("owner"); break; - case EDG_WLL_QUERY_ATTR_STATUS: printf("status"); break; - case EDG_WLL_QUERY_ATTR_LOCATION: printf("location"); break; - case EDG_WLL_QUERY_ATTR_DESTINATION: printf("destination"); break; - case EDG_WLL_QUERY_ATTR_DONECODE: printf("done_code"); break; - case EDG_WLL_QUERY_ATTR_EXITCODE: printf("exit_code"); break; - case EDG_WLL_QUERY_ATTR_PARENT: printf("parent_job"); break; - case EDG_WLL_QUERY_ATTR_RESUBMITTED: printf("resubmitted"); break; - case EDG_WLL_QUERY_ATTR_USERTAG: printf("%s",cond[i][j].attr_id.tag); break; - case EDG_WLL_QUERY_ATTR_TIME: printf("time"); break; - case EDG_WLL_QUERY_ATTR_STATEENTERTIME: printf("state_enter_time"); break; - case EDG_WLL_QUERY_ATTR_LASTUPDATETIME: printf("last_update_time"); break; - case EDG_WLL_QUERY_ATTR_JDL_ATTR: printf("jdl_attr"); break; - case EDG_WLL_QUERY_ATTR_LEVEL: printf("level"); break; - case EDG_WLL_QUERY_ATTR_HOST: printf("host"); break; - case EDG_WLL_QUERY_ATTR_SOURCE: printf("source"); break; - case EDG_WLL_QUERY_ATTR_INSTANCE: printf("instance"); break; - case EDG_WLL_QUERY_ATTR_EVENT_TYPE: printf("ev_type"); break; - case EDG_WLL_QUERY_ATTR_JOB_TYPE: printf("job_type"); break; - default: break; - } + printf("%s", edg_wll_QueryAttrNames[cond[i][j].attr]); switch ( cond[i][j].op ) { case EDG_WLL_QUERY_OP_EQUAL: printf("="); break; diff --git a/org.glite.lb.server/src/cond_dump.c b/org.glite.lb.server/src/cond_dump.c index 0161607..2c56f3b 100644 --- a/org.glite.lb.server/src/cond_dump.c +++ b/org.glite.lb.server/src/cond_dump.c @@ -58,54 +58,14 @@ int edg_wll_Condition_Dump(notifInfo *ni, char **output, int oneline){ GS("("); l2 = *l1; switch (l2->attr){ - case EDG_WLL_QUERY_ATTR_JOBID: GS("jobId"); - break; - case EDG_WLL_QUERY_ATTR_OWNER: GS("owner"); - break; - case EDG_WLL_QUERY_ATTR_STATUS: GS("status"); - break; - case EDG_WLL_QUERY_ATTR_LOCATION: GS("location"); - break; - case EDG_WLL_QUERY_ATTR_DESTINATION: GS("destination"); - break; - case EDG_WLL_QUERY_ATTR_DONECODE: GS("donecode"); - break; case EDG_WLL_QUERY_ATTR_USERTAG: GS(l2->attr_id.tag); break; - case EDG_WLL_QUERY_ATTR_TIME: GS("time"); - break; - case EDG_WLL_QUERY_ATTR_LEVEL: GS("level"); - break; - case EDG_WLL_QUERY_ATTR_HOST: GS("host"); - break; - case EDG_WLL_QUERY_ATTR_SOURCE: GS("source"); - break; - case EDG_WLL_QUERY_ATTR_INSTANCE: GS("instance"); - break; - case EDG_WLL_QUERY_ATTR_EVENT_TYPE: GS("eventtype"); - break; - case EDG_WLL_QUERY_ATTR_CHKPT_TAG: GS("chkpttag"); - break; - case EDG_WLL_QUERY_ATTR_RESUBMITTED: GS("resubmitted"); - break; - case EDG_WLL_QUERY_ATTR_PARENT: GS("parent_job"); - break; - case EDG_WLL_QUERY_ATTR_EXITCODE: GS("exitcode"); - break; case EDG_WLL_QUERY_ATTR_JDL_ATTR: GS(l2->attr_id.tag); //get JDL attribute name break; - case EDG_WLL_QUERY_ATTR_STATEENTERTIME: GS("stateentertime"); - break; - case EDG_WLL_QUERY_ATTR_LASTUPDATETIME: GS("lastupdatetime"); - break; - case EDG_WLL_QUERY_ATTR_NETWORK_SERVER: GS("networkserver"); - break; - case EDG_WLL_QUERY_ATTR_JOB_TYPE: GS("jobtype"); - break; default: - assert(! "Unknown attribute!"); + GS(edg_wll_QueryAttrNames[l2->attr]); break; } for (l2 = *l1; l2->attr; l2++){ -- 1.8.2.3