From d452771b591b94bc0d500025b0b8fe3ee0c5f2a8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Thu, 16 Mar 2006 16:42:03 +0000 Subject: [PATCH] Don't print zero timestamp nor NULL originDetail in "human readable" output, the origin written better. Required item timestamp is always dumped in XML format anyway. --- org.glite.jp.index/examples/jpis-client.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/org.glite.jp.index/examples/jpis-client.c b/org.glite.jp.index/examples/jpis-client.c index 400730a..6780b9b 100644 --- a/org.glite.jp.index/examples/jpis-client.c +++ b/org.glite.jp.index/examples/jpis-client.c @@ -53,6 +53,16 @@ struct { {0, "unknown"} }; +#define NUMBER_ORIG 3 +struct { + enum jptype__attrOrig orig; + const char *name; +} origins[] = { + {jptype__attrOrig__SYSTEM, "SYSTEM"}, + {jptype__attrOrig__USER, "USER"}, + {jptype__attrOrig__FILE_, "FILE"}, + {0, "unknown"} +}; typedef enum {FORMAT_XML, FORMAT_HR} format_t; @@ -294,7 +304,7 @@ static int queryresult_dump(struct soap *soap, int fd, const struct _jpisclient_ */ static void queryresult_print(FILE *out, const struct _jpelem__QueryJobsResponse *in) { struct jptype__attrValue *attr; - int i, j; + int i, j, k; fprintf(out, "Result %d jobs:\n", in->__sizejobs); for (j=0; j__sizejobs; j++) { @@ -305,8 +315,14 @@ static void queryresult_print(FILE *out, const struct _jpelem__QueryJobsRespons fprintf(out, "\t\t\tvalue = "); value_print(out, attr->value); fprintf(out, "\n"); - fprintf(out, "\t\t\torigin = %d, %s\n", attr->origin, attr->originDetail); - fprintf(out, "\t\t\ttime = %s", ctime(&attr->timestamp)); + + for (k = 0; k <= NUMBER_ORIG; k++) + if (origins[k].orig == attr->origin) break; + fprintf(out, "\t\t\torigin = %s", origins[k].name, attr->originDetail); + if (attr->originDetail) fprintf(out, ", %s\n", attr->originDetail); + else fprintf(out, " (no detail)\n"); + if (attr->timestamp != (time_t)0) + fprintf(out, "\t\t\ttime = %s", ctime(&attr->timestamp)); } } } -- 1.8.2.3