HTRACE-305 htrace-web: Use greater-than-or-equal rather than greater-than in more places (cmccabe)
diff --git a/htrace-webapp/src/main/webapp/app/predicate.js b/htrace-webapp/src/main/webapp/app/predicate.js
index 6526719..99cd302 100644
--- a/htrace-webapp/src/main/webapp/app/predicate.js
+++ b/htrace-webapp/src/main/webapp/app/predicate.js
@@ -91,20 +91,20 @@
htrace.parsePType = function(name) {
switch (name) {
- case "Began after":
- return new htrace.PType({name: name, field:"begin", op:"gt"});
+ case "Began at or after":
+ return new htrace.PType({name: name, field:"begin", op:"ge"});
case "Began at or before":
return new htrace.PType({name: name, field:"begin", op:"le"});
- case "Ended after":
- return new htrace.PType({name: name, field:"end", op:"gt"});
+ case "Ended at or after":
+ return new htrace.PType({name: name, field:"end", op:"ge"});
case "Ended at or before":
return new htrace.PType({name: name, field:"end", op:"le"});
case "Description contains":
return new htrace.PType({name: name, field:"description", op:"cn"});
case "Description is exactly":
return new htrace.PType({name: name, field:"description", op:"eq"});
- case "Duration is longer than":
- return new htrace.PType({name: name, field:"duration", op:"gt"});
+ case "Duration is at least":
+ return new htrace.PType({name: name, field:"duration", op:"ge"});
case "Duration is at most":
return new htrace.PType({name: name, field:"duration", op:"le"});
case "Span ID is":
diff --git a/htrace-webapp/src/main/webapp/index.html b/htrace-webapp/src/main/webapp/index.html
index edbfd26..7f4a687 100644
--- a/htrace-webapp/src/main/webapp/index.html
+++ b/htrace-webapp/src/main/webapp/index.html
@@ -174,11 +174,11 @@
</button>
<ul class="dropdown-menu" role="menu">
<li><a href="javascript:void(0)"
- class="add-field">Began after</a></li>
+ class="add-field">Began at or after</a></li>
<li><a href="javascript:void(0)"
class="add-field">Began at or before</a></li>
<li><a href="javascript:void(0)"
- class="add-field">Ended after</a></li>
+ class="add-field">Ended at or after</a></li>
<li><a href="javascript:void(0)"
class="add-field">Ended at or before</a></li>
<li><a href="javascript:void(0)"
@@ -186,7 +186,7 @@
<li><a href="javascript:void(0)"
class="add-field">Description is exactly</a></li>
<li><a href="javascript:void(0)"
- class="add-field">Duration is longer than</a></li>
+ class="add-field">Duration is at least</a></li>
<li><a href="javascript:void(0)"
class="add-field">Duration is at most</a></li>
<li><a href="javascript:void(0)"
