[or-cvs] [metrics-web/master] Add more countries of the MENA region to the country list.
karsten at torproject.org
karsten at torproject.org
Sat Jan 29 07:06:10 UTC 2011
commit 3eaf02711207b9c23525cb0a9c1387000b052679
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date: Sat Jan 29 08:05:20 2011 +0100
Add more countries of the MENA region to the country list.
---
rserve/graphs.R | 46 +++++++++++---------
.../ernie/web/GraphParameterChecker.java | 6 +-
web/WEB-INF/users.jsp | 24 ++++++++++
3 files changed, 53 insertions(+), 23 deletions(-)
diff --git a/rserve/graphs.R b/rserve/graphs.R
index 8df2eac..89bd3ac 100644
--- a/rserve/graphs.R
+++ b/rserve/graphs.R
@@ -234,16 +234,19 @@ plot_direct_users <- function(start, end, country, path) {
u <- rbind(u,
data.frame(date = as.Date(missing, origin = "1970-01-01"),
users = NA))
- peoples <- data.frame(country = c("au", "bh", "br", "ca", "cn", "cu",
- "de", "eg", "et", "fr", "gb", "ir", "it", "jp", "kp", "kr", "lb",
- "mm", "pl", "qa", "ru", "sa", "se", "sy", "tn", "tm", "us", "uz",
- "vn", "ye"),
- people = c("Australian", "Bahraini", "Brazilian", "Canadian",
- "Chinese", "Cuban", "German", "Egyptian", "Ethiopian", "French",
- "U.K.", "Iranian", "Italian", "Japanese", "North Korean",
- "South Korean", "Lebanese", "Burmese", "Polish", "Qatari", "Russian",
- "Saudi", "Swedish", "Syrian", "Tunisian", "Turkmen", "U.S.", "Uzbek",
- "Vietnamese", "Yemeni"),
+ peoples <- data.frame(country = c("ae", "au", "bh", "br", "ca", "cn",
+ "cu", "de", "dj", "dz", "eg", "et", "fr", "gb", "il", "ir", "it",
+ "iq", "jo", "jp", "kp", "kr", "kw", "lb", "ly", "ma", "mm", "om",
+ "pl", "ps", "qa", "ru", "sa", "sd", "se", "sy", "tn", "tm", "us",
+ "uz", "vn", "ye"),
+ people = c("U.A.E.", "Australian", "Bahraini", "Brazilian",
+ "Canadian", "Chinese", "Cuban", "German", "Djiboutian", "Algerian",
+ "Egyptian", "Ethiopian", "French", "U.K.", "Israeli", "Iranian",
+ "Italian", "Iraqi", "Jordanian", "Japanese", "North Korean",
+ "South Korean", "Kuwaiti", "Lebanese", "Libyan", "Moroccan",
+ "Burmese", "Omani", "Polish", "Palestinian", "Qatari", "Russian",
+ "Saudi", "Sudanese", "Swedish", "Syrian", "Tunisian", "Turkmen",
+ "U.S.", "Uzbek", "Vietnamese", "Yemeni"),
stringsAsFactors = FALSE)
title <- ifelse(country == "all",
"Total directly connecting Tor users (all data)\n",
@@ -279,16 +282,19 @@ plot_bridge_users <- function(start, end, country, path) {
bridgeusers <- rbind(bridgeusers,
data.frame(date = as.Date(missing, origin = "1970-01-01"),
users = NA))
- peoples <- data.frame(country = c("au", "bh", "br", "ca", "cn", "cu",
- "de", "eg", "et", "fr", "gb", "ir", "it", "jp", "kp", "kr", "lb",
- "mm", "pl", "qa", "ru", "sa", "se", "sy", "tn", "tm", "us", "uz",
- "vn", "ye"),
- people = c("Australian", "Bahraini", "Brazilian", "Canadian",
- "Chinese", "Cuban", "German", "Egyptian", "Ethiopian", "French",
- "U.K.", "Iranian", "Italian", "Japanese", "North Korean",
- "South Korean", "Lebanese", "Burmese", "Polish", "Qatari", "Russian",
- "Saudi", "Swedish", "Syrian", "Tunisian", "Turkmen", "U.S.", "Uzbek",
- "Vietnamese", "Yemeni"),
+ peoples <- data.frame(country = c("ae", "au", "bh", "br", "ca", "cn",
+ "cu", "de", "dj", "dz", "eg", "et", "fr", "gb", "il", "ir", "it",
+ "iq", "jo", "jp", "kp", "kr", "kw", "lb", "ly", "ma", "mm", "om",
+ "pl", "ps", "qa", "ru", "sa", "sd", "se", "sy", "tn", "tm", "us",
+ "uz", "vn", "ye"),
+ people = c("U.A.E.", "Australian", "Bahraini", "Brazilian",
+ "Canadian", "Chinese", "Cuban", "German", "Djiboutian", "Algerian",
+ "Egyptian", "Ethiopian", "French", "U.K.", "Israeli", "Iranian",
+ "Italian", "Iraqi", "Jordanian", "Japanese", "North Korean",
+ "South Korean", "Kuwaiti", "Lebanese", "Libyan", "Moroccan",
+ "Burmese", "Omani", "Polish", "Palestinian", "Qatari", "Russian",
+ "Saudi", "Sudanese", "Swedish", "Syrian", "Tunisian", "Turkmen",
+ "U.S.", "Uzbek", "Vietnamese", "Yemeni"),
stringsAsFactors = FALSE)
title <- ifelse(country == "all",
"Total users via bridges (all data)\n",
diff --git a/src/org/torproject/ernie/web/GraphParameterChecker.java b/src/org/torproject/ernie/web/GraphParameterChecker.java
index 3d255d7..3d1648b 100644
--- a/src/org/torproject/ernie/web/GraphParameterChecker.java
+++ b/src/org/torproject/ernie/web/GraphParameterChecker.java
@@ -62,9 +62,9 @@ public class GraphParameterChecker {
this.knownParameterValues = new HashMap<String, String>();
this.knownParameterValues.put("flag",
"Running,Exit,Guard,Fast,Stable");
- this.knownParameterValues.put("country", "all,au,bh,br,ca,cn,cu,de,"
- + "eg,et,fr,gb,ir,it,jp,kp,kr,lb,mm,pl,qa,ru,sa,se,sy,tn,tm,us,"
- + "uz,vn,ye");
+ this.knownParameterValues.put("country", "all,ae,au,bh,br,ca,cn,cu,"
+ + "de,dj,dz,eg,et,fr,gb,il,ir,it,iq,jo,jp,kp,kr,kw,lb,ly,ma,mm,"
+ + "om,pl,ps,qa,ru,sa,sd,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 092b98d..bbca073 100644
--- a/web/WEB-INF/users.jsp
+++ b/web/WEB-INF/users.jsp
@@ -37,6 +37,7 @@ based on the requests seen by a few dozen directory mirrors.</p>
</p><p>
Source: <select name="country">
<option value="all" selected>All users</option>
+ <option value="ae">United Arab Emirates</option>
<option value="au">Australia</option>
<option value="bh">Bahrain</option>
<option value="br">Brazil</option>
@@ -44,21 +45,32 @@ based on the requests seen by a few dozen directory mirrors.</p>
<option value="cn">China</option>
<option value="cu">Cuba</option>
<option value="de">Germany</option>
+ <option value="dj">Djibouti</option>
+ <option value="dz">Algeria</option>
<option value="eg">Egypt</option>
<option value="et">Ethiopia</option>
<option value="fr">France</option>
<option value="gb">U.K.</option>
+ <option value="il">Israel</option>
<option value="ir">Iran</option>
<option value="it">Italy</option>
+ <option value="iq">Iraq</option>
+ <option value="jo">Jordan</option>
<option value="jp">Japan</option>
<option value="kp">North Korea</option>
<option value="kr">South Korea</option>
+ <option value="kw">Kuwait</option>
<option value="lb">Lebanon</option>
+ <option value="ly">Libya</option>
+ <option value="ma">Morocco</option>
<option value="mm">Burma</option>
+ <option value="om">Oman</option>
<option value="pl">Poland</option>
+ <option value="ps">Palestinian territories</option>
<option value="qa">Qatar</option>
<option value="ru">Russia</option>
<option value="sa">Saudi Arabia</option>
+ <option value="sd">Sudan</option>
<option value="se">Sweden</option>
<option value="sy">Syria</option>
<option value="tn">Tunisia</option>
@@ -102,6 +114,7 @@ by a few hundred bridges.</p>
</p><p>
Source: <select name="country">
<option value="all" selected>All users</option>
+ <option value="ae">United Arab Emirates</option>
<option value="au">Australia</option>
<option value="bh">Bahrain</option>
<option value="br">Brazil</option>
@@ -109,21 +122,32 @@ by a few hundred bridges.</p>
<option value="cn">China</option>
<option value="cu">Cuba</option>
<option value="de">Germany</option>
+ <option value="dj">Djibouti</option>
+ <option value="dz">Algeria</option>
<option value="eg">Egypt</option>
<option value="et">Ethiopia</option>
<option value="fr">France</option>
<option value="gb">U.K.</option>
+ <option value="il">Israel</option>
<option value="ir">Iran</option>
<option value="it">Italy</option>
+ <option value="iq">Iraq</option>
+ <option value="jo">Jordan</option>
<option value="jp">Japan</option>
<option value="kp">North Korea</option>
<option value="kr">South Korea</option>
+ <option value="kw">Kuwait</option>
<option value="lb">Lebanon</option>
+ <option value="ly">Libya</option>
+ <option value="ma">Morocco</option>
<option value="mm">Burma</option>
+ <option value="om">Oman</option>
<option value="pl">Poland</option>
+ <option value="ps">Palestinian territories</option>
<option value="qa">Qatar</option>
<option value="ru">Russia</option>
<option value="sa">Saudi Arabia</option>
+ <option value="sd">Sudan</option>
<option value="se">Sweden</option>
<option value="sy">Syria</option>
<option value="tn">Tunisia</option>
More information about the tor-commits
mailing list