commit 4ca5b00a3a674a4b36bd10ce075b9c99f8c7ab88 Author: Karsten Loesing <karsten.loesing@gmx.net> Date: Tue Dec 10 12:14:21 2013 +0100 Remove left-over code from GetTor graphs. For reference, GetTor graphs were removed on August 7, 2012 in commit 27869c49223db85aa05baad14ffc619708d9e661. --- etc/web.xml | 4 ---- rserve/graphs.R | 12 ------------ .../torproject/ernie/web/graphs/GraphsSubpagesServlet.java | 2 -- 3 files changed, 18 deletions(-) diff --git a/etc/web.xml b/etc/web.xml index 866f427..c8e4935 100644 --- a/etc/web.xml +++ b/etc/web.xml @@ -48,10 +48,6 @@ </servlet-mapping> <servlet-mapping> <servlet-name>GraphsSubpages</servlet-name> - <url-pattern>/packages.html</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>GraphsSubpages</servlet-name> <url-pattern>/performance.html</url-pattern> </servlet-mapping> diff --git a/rserve/graphs.R b/rserve/graphs.R index bf6f8c7..014ffc0 100644 --- a/rserve/graphs.R +++ b/rserve/graphs.R @@ -254,18 +254,6 @@ countryname <- function(country) { res } -languagelist <- list( - "en" = "English", - "fa" = "Farsi", - "zh_CN" = "Simplified Chinese") - -languagename <- function(language) { - res <- languagelist[[language]] - if (is.null(res)) - res <- "Gibberish" - res -} - date_breaks <- function(days) { length <- cut(days, c(0, 7, 12, 56, 180, 600, 5000, Inf), labels=FALSE) major <- c("days", "2 days", "weeks", "months", "3 months", "years", diff --git a/src/org/torproject/ernie/web/graphs/GraphsSubpagesServlet.java b/src/org/torproject/ernie/web/graphs/GraphsSubpagesServlet.java index c79f1e3..94d7340 100644 --- a/src/org/torproject/ernie/web/graphs/GraphsSubpagesServlet.java +++ b/src/org/torproject/ernie/web/graphs/GraphsSubpagesServlet.java @@ -42,8 +42,6 @@ public class GraphsSubpagesServlet extends HttpServlet { this.availableGraphsSubpages.put("fast-exits.html", "WEB-INF/fast-exits.jsp"); this.availableGraphsSubpages.put("users.html", "WEB-INF/users.jsp"); - this.availableGraphsSubpages.put("packages.html", - "WEB-INF/packages.jsp"); this.availableGraphsSubpages.put("performance.html", "WEB-INF/performance.jsp");