[or-cvs] [metrics-web/master] Add Egypt to list of countries.

[karsten at torproject.org]

commit 8d85fc68c3f350dce85faf77422d3d1995eeab2a
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Wed Jan 26 16:41:28 2011 +0100

    Add Egypt to list of countries.
---
 rserve/graphs.R                                    |   26 ++++++++++---------
 .../ernie/web/GraphParameterChecker.java           |    2 +-
 web/WEB-INF/users.jsp                              |    2 +
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/rserve/graphs.R b/rserve/graphs.R
index cafe644..097fb3c 100644
--- a/rserve/graphs.R
+++ b/rserve/graphs.R
@@ -235,13 +235,14 @@ plot_direct_users <- function(start, end, country, path) {
         data.frame(date = as.Date(missing, origin = "1970-01-01"),
         users = NA))
   peoples <- data.frame(country = c("au", "bh", "br", "ca", "cn", "cu",
-    "de", "et", "fr", "gb", "ir", "it", "jp", "kr", "mm", "pl", "ru",
-    "sa", "se", "sy", "tn", "tm", "us", "uz", "vn", "ye"),
+    "de", "eg", "et", "fr", "gb", "ir", "it", "jp", "kr", "mm", "pl",
+    "ru", "sa", "se", "sy", "tn", "tm", "us", "uz", "vn", "ye"),
     people = c("Australian", "Bahraini", "Brazilian", "Canadian",
-    "Chinese", "Cuban", "German", "Ethiopian", "French", "U.K.",
-    "Iranian", "Italian", "Japanese", "South Korean", "Burmese", "Polish",
-    "Russian", "Saudi", "Swedish", "Syrian", "Tunisian", "Turkmen",
-    "U.S.", "Uzbek", "Vietnamese", "Yemeni"), stringsAsFactors = FALSE)
+    "Chinese", "Cuban", "German", "Egyptian", "Ethiopian", "French",
+    "U.K.", "Iranian", "Italian", "Japanese", "South Korean", "Burmese",
+    "Polish", "Russian", "Saudi", "Swedish", "Syrian", "Tunisian",
+    "Turkmen", "U.S.", "Uzbek", "Vietnamese", "Yemeni"),
+    stringsAsFactors = FALSE)
   title <- ifelse(country == "all",
     "Total directly connecting Tor users (all data)\n",
     paste("Directly connecting",
@@ -277,13 +278,14 @@ plot_bridge_users <- function(start, end, country, path) {
         data.frame(date = as.Date(missing, origin = "1970-01-01"),
         users = NA))
   peoples <- data.frame(country = c("au", "bh", "br", "ca", "cn", "cu",
-    "de", "et", "fr", "gb", "ir", "it", "jp", "kr", "mm", "pl", "ru",
-    "sa", "se", "sy", "tn", "tm", "us", "uz", "vn", "ye"),
+    "de", "eg", "et", "fr", "gb", "ir", "it", "jp", "kr", "mm", "pl",
+    "ru", "sa", "se", "sy", "tn", "tm", "us", "uz", "vn", "ye"),
     people = c("Australian", "Bahraini", "Brazilian", "Canadian",
-    "Chinese", "Cuban", "German", "Ethiopian", "French", "U.K.",
-    "Iranian", "Italian", "Japanese", "South Korean", "Burmese", "Polish",
-    "Russian", "Saudi", "Swedish", "Syrian", "Tunisian", "Turkmen",
-    "U.S.", "Uzbek", "Vietnamese", "Yemeni"), stringsAsFactors = FALSE)
+    "Chinese", "Cuban", "German", "Egyptian", "Ethiopian", "French",
+    "U.K.", "Iranian", "Italian", "Japanese", "South Korean", "Burmese",
+    "Polish", "Russian", "Saudi", "Swedish", "Syrian", "Tunisian",
+    "Turkmen", "U.S.", "Uzbek", "Vietnamese", "Yemeni"),
+    stringsAsFactors = FALSE)
   title <- ifelse(country == "all",
     "Total users via bridges (all data)\n",
     paste(peoples[peoples$country == country, "people"],
diff --git a/src/org/torproject/ernie/web/GraphParameterChecker.java b/src/org/torproject/ernie/web/GraphParameterChecker.java
index 9db37e3..ad9f0a7 100644
--- a/src/org/torproject/ernie/web/GraphParameterChecker.java
+++ b/src/org/torproject/ernie/web/GraphParameterChecker.java
@@ -61,7 +61,7 @@ public class GraphParameterChecker {
     this.knownParameterValues.put("flag",
         "Running,Exit,Guard,Fast,Stable");
     this.knownParameterValues.put("country", "all,au,bh,br,ca,cn,cu,de,"
-        + "et,fr,gb,ir,it,jp,kr,mm,pl,ru,sa,se,sy,tn,tm,us,uz,vn,ye");
+        + "eg,et,fr,gb,ir,it,jp,kr,mm,pl,ru,sa,se,sy,tn,tm,us,uz,vn,ye");
     this.knownParameterValues.put("bundle", "all,en,zh_CN,fa");
     this.knownParameterValues.put("source", "all,siv,moria,torperf");
     this.knownParameterValues.put("filesize", "50kb,1mb,5mb");
diff --git a/web/WEB-INF/users.jsp b/web/WEB-INF/users.jsp
index 10c3ec7..2c636d7 100644
--- a/web/WEB-INF/users.jsp
+++ b/web/WEB-INF/users.jsp
@@ -44,6 +44,7 @@ based on the requests seen by a few dozen directory mirrors.</p>
       <input type="radio" name="country" value="cn">China
       <input type="radio" name="country" value="cu">Cuba
       <input type="radio" name="country" value="de">Germany
+      <input type="radio" name="country" value="eg">Egypt
       <input type="radio" name="country" value="et">Ethiopia
       <input type="radio" name="country" value="fr">France
       <input type="radio" name="country" value="gb">U.K.
@@ -104,6 +105,7 @@ by a few hundred bridges.</p>
       <input type="radio" name="country" value="cn">China
       <input type="radio" name="country" value="cu">Cuba
       <input type="radio" name="country" value="de">Germany
+      <input type="radio" name="country" value="eg">Egypt
       <input type="radio" name="country" value="et">Ethiopia
       <input type="radio" name="country" value="fr">France
       <input type="radio" name="country" value="gb">U.K.