From: Jiří Filipovič <fila@ics.muni.cz>
Date: Fri, 9 Jul 2010 11:27:57 +0000 (+0000)
Subject: set destination value to NULL instead of "ALL" for batch retrieval
X-Git-Tag: glite-jobid-api-c_R_1_0_5_1~24
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=5c7cf4f9b3a7bbdcb93a492d7393d7cb65c12d82;p=jra1mw.git

set destination value to NULL instead of "ALL" for batch retrieval
---

diff --git a/org.glite.lb.client/examples/stats-duration-fromto.c b/org.glite.lb.client/examples/stats-duration-fromto.c
index 5603998..3682284 100644
--- a/org.glite.lb.client/examples/stats-duration-fromto.c
+++ b/org.glite.lb.client/examples/stats-duration-fromto.c
@@ -48,7 +48,10 @@ int main(int argc,char **argv)
 /* the only supported grouping for now */
 	group[0].attr = EDG_WLL_QUERY_ATTR_DESTINATION;
 	group[0].op = EDG_WLL_QUERY_OP_EQUAL;
-	group[0].value.c = argv[1];
+	if (strcmp(argv[1], "ALL"))
+		group[0].value.c = argv[1];
+	else
+		group[0].value.c = NULL;
 	group[1].attr = EDG_WLL_QUERY_ATTR_UNDEF;
 
 
diff --git a/org.glite.lb.client/examples/stats.c b/org.glite.lb.client/examples/stats.c
index d284905..10c3200 100644
--- a/org.glite.lb.client/examples/stats.c
+++ b/org.glite.lb.client/examples/stats.c
@@ -50,7 +50,10 @@ int main(int argc,char **argv)
 /* the only supported grouping for now */
 	group[0].attr = EDG_WLL_QUERY_ATTR_DESTINATION;
 	group[0].op = EDG_WLL_QUERY_OP_EQUAL;
-	group[0].value.c = argv[1];
+	if (strcmp(argv[1], "ALL"))
+		group[0].value.c = argv[1];
+	else
+		group[0].value.c = NULL;
 	group[1].attr = EDG_WLL_QUERY_ATTR_UNDEF;
 
 
diff --git a/org.glite.lb.common/src/xml_parse.c.T b/org.glite.lb.common/src/xml_parse.c.T
index f449c77..9b3f8de 100644
--- a/org.glite.lb.common/src/xml_parse.c.T
+++ b/org.glite.lb.common/src/xml_parse.c.T
@@ -2566,7 +2566,9 @@ int edg_wll_JobQueryRecToXML(
 	                                        edg_wll_add_string_to_XMLBody(&pomValue, conditions[row][i].value.c, "location", NULL);
 	                                        break;
 	                                case EDG_WLL_QUERY_ATTR_DESTINATION:
-	                                        edg_wll_add_string_to_XMLBody(&pomValue, conditions[row][i].value.c, "destination", NULL);
+	                                        conditions[row][i].value.c ?
+							edg_wll_add_string_to_XMLBody(&pomValue, conditions[row][i].value.c, "destination", NULL) :
+							edg_wll_add_string_to_XMLBody(&pomValue, "", "destination", NULL);
 	                                        break;
 	                                case EDG_WLL_QUERY_ATTR_NETWORK_SERVER:
 	                                        edg_wll_add_string_to_XMLBody(&pomValue, conditions[row][i].value.c, "networkserver", NULL);
diff --git a/org.glite.lb.server/src/stats.c b/org.glite.lb.server/src/stats.c
index b4b0296..45b45ac 100644
--- a/org.glite.lb.server/src/stats.c
+++ b/org.glite.lb.server/src/stats.c
@@ -592,7 +592,7 @@ int edg_wll_StateRateServer(
 
 	if (flock(stats->fd,LOCK_SH)) return edg_wll_SetError(ctx,errno,"flock()");
 
-	if (strcmp(group->value.c, "ALL")){
+	if (group->value.c){
 		/* single group */
 		sig = str2md5base64(group->value.c);
 
@@ -835,7 +835,7 @@ int edg_wll_StateDurationFromToServer(
 
         if (flock(stats->fd,LOCK_SH)) return edg_wll_SetError(ctx,errno,"flock()");
 
-	if (strcmp(group->value.c, "ALL")){
+	if (group->value.c){
 		/* single group */
 	        sig = str2md5base64(group->value.c);
 		*durations = (float*)malloc(1*sizeof((*durations)[0]));