commit 1f8f8ea57dd0636b28fa1fa56bd3306ec848f27a Author: Karsten Loesing karsten.loesing@gmx.net Date: Thu Dec 13 10:16:38 2012 +0100

Disable relay flags graph on hourly detail.

Implements #7652. --- etc/web.xml | 3 --- .../ernie/web/GraphParameterChecker.java | 2 +- src/org/torproject/ernie/web/RObjectGenerator.java | 1 - web/WEB-INF/network.jsp | 4 ---- 4 files changed, 1 insertions(+), 9 deletions(-)

diff --git a/etc/web.xml b/etc/web.xml index 903f23d..c7262ef 100644 --- a/etc/web.xml +++ b/etc/web.xml @@ -169,9 +169,6 @@ <url-pattern>/relayflags.png</url-pattern> <url-pattern>/relayflags.pdf</url-pattern> <url-pattern>/relayflags.svg</url-pattern> - <url-pattern>/relayflags-hour.png</url-pattern> - <url-pattern>/relayflags-hour.pdf</url-pattern> - <url-pattern>/relayflags-hour.svg</url-pattern> <url-pattern>/versions.png</url-pattern> <url-pattern>/versions.pdf</url-pattern> <url-pattern>/versions.svg</url-pattern> diff --git a/src/org/torproject/ernie/web/GraphParameterChecker.java b/src/org/torproject/ernie/web/GraphParameterChecker.java index d2386dd..e93f9ea 100644 --- a/src/org/torproject/ernie/web/GraphParameterChecker.java +++ b/src/org/torproject/ernie/web/GraphParameterChecker.java @@ -50,7 +50,7 @@ public class GraphParameterChecker { this.knownParameterValues = new HashMap<String, String>(); this.knownParameterValues.put("flag", "Running,Exit,Guard,Fast,Stable"); - this.knownParameterValues.put("granularity", "day,hour"); + this.knownParameterValues.put("granularity", "day"); StringBuilder sb = new StringBuilder("all"); for (String[] country : Countries.getInstance().getCountryList()) { sb.append("," + country[0]); diff --git a/src/org/torproject/ernie/web/RObjectGenerator.java b/src/org/torproject/ernie/web/RObjectGenerator.java index be01d0b..086d321 100644 --- a/src/org/torproject/ernie/web/RObjectGenerator.java +++ b/src/org/torproject/ernie/web/RObjectGenerator.java @@ -71,7 +71,6 @@ public class RObjectGenerator implements ServletContextListener { this.availableCsvFiles.add("platforms"); this.availableCsvFiles.add("relaycountries"); this.availableCsvFiles.add("relayflags"); - this.availableCsvFiles.add("relayflags-hour"); this.availableCsvFiles.add("torperf"); this.availableCsvFiles.add("torperf-failures"); this.availableCsvFiles.add("versions"); diff --git a/web/WEB-INF/network.jsp b/web/WEB-INF/network.jsp index cc783d5..a43c46e 100644 --- a/web/WEB-INF/network.jsp +++ b/web/WEB-INF/network.jsp @@ -114,10 +114,6 @@ average number of relays with these flags assigned.</p> <input type="checkbox" name="flag" value="Guard"<c:if test="${fn:length(relayflags_flag) == 0 or fn:contains(fn:join(relayflags_flag, ','), 'Guard')}"> checked</c:if>> Guard <input type="checkbox" name="flag" value="Stable"<c:if test="${fn:length(relayflags_flag) == 0 or fn:contains(fn:join(relayflags_flag, ','), 'Stable')}"> checked</c:if>> Stable </p><p> - Granularity: - <input type="radio" name="granularity" value="day" <c:if test="${fn:length(relayflags_granularity) == 0 or relayflags_granularity[0] eq 'day'}"> checked</c:if>> 1 day - <input type="radio" name="granularity" value="hour" <c:if test="${relayflags_granularity[0] eq 'hour'}"> checked</c:if>> 1 hour - </p><p> <input class="submit" type="submit" value="Update graph"> </p> </div>