From f113e1658aca217be789a4b15d99ce5ebb9864a7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zden=C4=9Bk=20=C5=A0ustr?= Date: Mon, 5 Sep 2011 09:47:29 +0000 Subject: [PATCH] Remove refenrences to 'events' or 'summaries' from cmdline arguments and documentation. Introduce the new term "Job History" instead. --- org.glite.lb.client/src/notify.c | 10 +++++----- org.glite.lb.doc/src/notify.tex | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/org.glite.lb.client/src/notify.c b/org.glite.lb.client/src/notify.c index 51c382d..5641f30 100644 --- a/org.glite.lb.client/src/notify.c +++ b/org.glite.lb.client/src/notify.c @@ -50,7 +50,7 @@ static void usage(char *cmd) me); } if ( !cmd || !strcmp(cmd, "new") ) - fprintf(stderr,"\n'new' command usage: %s new [ { -s socket_fd | -a fake_addr } -t requested_validity -j jobid { -o owner | -O } -n network_server -v virtual_organization --state state1,state2,... -c -J -B -T -E -f flags]\n" + fprintf(stderr,"\n'new' command usage: %s new [ { -s socket_fd | -a fake_addr } -t requested_validity -j jobid { -o owner | -O } -n network_server -v virtual_organization --state state1,state2,... -c -J -B -T -H -f flags]\n" " jobid Job ID to connect notif. reg. with\n" " owner Match this owner DN\n" " requested_validity Validity of notification req. in seconds\n" @@ -62,7 +62,7 @@ static void usage(char *cmd) " -J | --jdl Attach JDL to job status being returned\n" " -B | --bootstrap Also send past events matching conditions\n" " -T | --terminal Notify only when a job reaches terminal state\n" - " -E | --summary Same as -T plus attach a summary of all job's Events\n" + " -H | --history Same as -T plus attach a history of all job's Events\n" , me); if ( !cmd || !strcmp(cmd, "bind") ) fprintf(stderr,"\n'bind' command usage: %s bind [ { -s socket_fd | -a fake_addr } -t requested_validity ] notifids \n" @@ -139,7 +139,7 @@ int main(int argc,char **argv) {"jdl", no_argument, 0, 'J'}, {"bootstrap", no_argument, 0, 'B'}, {"terminal", no_argument, 0, 'T'}, - {"summary", no_argument, 0, 'E'}, + {"history", no_argument, 0, 'H'}, {0, 0, 0, 0}}; int option_index = 0; char *single, *statelist, *notif_server; @@ -151,7 +151,7 @@ int main(int argc,char **argv) conditions = (edg_wll_QueryRec **)calloc(MAX_NEW_CONDS + 1,sizeof(edg_wll_QueryRec *)); conditions[0] = (edg_wll_QueryRec *)calloc(2,sizeof(edg_wll_QueryRec)); - while ((c = getopt_long(argc-1,argv+1,"j:o:v:n:s:a:t:f:cOS:JBTE",long_options,&option_index)) > 0) { switch (c) { + while ((c = getopt_long(argc-1,argv+1,"j:o:v:n:s:a:t:f:cOS:JBTH",long_options,&option_index)) > 0) { switch (c) { case 'j': conditions[i] = (edg_wll_QueryRec *)calloc(2,sizeof(edg_wll_QueryRec)); conditions[i][0].attr = EDG_WLL_QUERY_ATTR_JOBID; @@ -210,7 +210,7 @@ int main(int argc,char **argv) flags |= EDG_WLL_NOTIF_BOOTSTRAP; break; case 'T': flags |= EDG_WLL_NOTIF_TERMINAL_STATES; break; - case 'E': + case 'H': flags |= EDG_WLL_NOTIF_TERMINAL_STATES | EDG_WLL_NOTIF_EVENT_SUMMARY; break; case 'c': conditions[i] = (edg_wll_QueryRec *)calloc(2,sizeof(edg_wll_QueryRec)); diff --git a/org.glite.lb.doc/src/notify.tex b/org.glite.lb.doc/src/notify.tex index c65234f..9e24254 100644 --- a/org.glite.lb.doc/src/notify.tex +++ b/org.glite.lb.doc/src/notify.tex @@ -55,7 +55,7 @@ For action \verb'new', command usage is: \begin{verbatim} glite-lb-notify new [ { -s socket_fd | -a fake_addr } -t requested_validity -j jobid { -o owner | -O } -n network_server - -v virtual_organization --state state1,state2,... -c -J -B -T -E -f flags] + -v virtual_organization --state state1,state2,... -c -J -B -T -H -f flags] \end{verbatim} For action \verb'bind', command usage is: @@ -99,7 +99,7 @@ where \texttt{ -J, -{}-jdl} & Attach JDL to job status being returned \\ \texttt{ -B, -{}-bootstrap} & Also send past events matching conditions \\ \texttt{ -T, -{}-terminal} & Notify only when a job reaches terminal state \\ -\texttt{ -E, -{}-summary} & Same as \texttt{-T} plus attach a summary of all job's events \\ +\texttt{ -H, -{}-history} & Same as \texttt{-T} plus attach a history of all job's events \\ \end{tabularx} For additional information see also manual page glite-lb-notify(1). -- 1.8.2.3