From: Aleš Křenek <ljocha@ics.muni.cz>
Date: Sat, 1 Apr 2006 16:08:17 +0000 (+0000)
Subject: pull in 1.6->1.8 (favour usec in = query ...)
X-Git-Tag: glite-lb-server_R_1_3_7~3
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=73f81ba09ddc1fa61f94a5223a5f902a2bbff63d;p=jra1mw.git

pull in 1.6->1.8 (favour usec in = query ...)
---

diff --git a/org.glite.lb.server/src/query.c b/org.glite.lb.server/src/query.c
index 196c9be..076c9cd 100644
--- a/org.glite.lb.server/src/query.c
+++ b/org.glite.lb.server/src/query.c
@@ -613,6 +613,10 @@ static char *ec_to_head_where(edg_wll_Context ctx,const edg_wll_QueryRec **ec)
 					trio_asprintf(&out, "%s OR (e.time_stamp >= %s AND e.time_stamp <= %s)", conds, aux, dbt);
 					free(aux);
 				}
+				else if (ec[m][n].op == EDG_WLL_QUERY_OP_EQUAL) {
+					trio_asprintf(&out, "%s OR (e.time_stamp = %s AND e.usec = %d)",
+							conds, dbt, ec[m][n].value.t.tv_usec);
+				}
 				else
 					trio_asprintf(&out, "%s OR e.time_stamp %s %s", conds, opToString(ec[m][n].op), dbt);
 				free(conds);
@@ -625,6 +629,10 @@ static char *ec_to_head_where(edg_wll_Context ctx,const edg_wll_QueryRec **ec)
 				trio_asprintf(&conds, "(e.time_stamp >= %s AND e.time_stamp <= %s)", aux, dbt);
 				free(aux);
 			}
+			else if (ec[m][n].op == EDG_WLL_QUERY_OP_EQUAL) {
+				trio_asprintf(&conds, "(e.time_stamp = %s AND e.usec = %d)",
+						dbt, ec[m][n].value.t.tv_usec);
+			}
 			else
 				trio_asprintf(&conds, "e.time_stamp %s %s", opToString(ec[m][n].op), dbt);
 			break;