[tor-commits] [metrics-web/master] Fix direct-user graphs containing zero users.

[karsten at torproject.org]

commit c22e487d2bec3329ba55783c1645bb5cc35fb5fe
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Wed Aug 31 16:35:58 2011 +0200

    Fix direct-user graphs containing zero users.
---
 rserve/graphs.R |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/rserve/graphs.R b/rserve/graphs.R
index d1356b4..5a89c96 100644
--- a/rserve/graphs.R
+++ b/rserve/graphs.R
@@ -631,7 +631,7 @@ plot_direct_users <- function(start, end, country, events, path, dpi) {
     as.numeric(max(as.Date(u$date, "%Y-%m-%d")) -
     min(as.Date(u$date, "%Y-%m-%d"))))
   plot <- ggplot(u, aes(x = as.Date(date, "%Y-%m-%d"), y = users))
-  if (events == "on" & country != "all") {
+  if (length(na.omit(u$users)) > 0 & events == "on" & country != "all") {
     r <- read.csv(
       "/srv/metrics.torproject.org/web/detector/direct-users-ranges.csv",
       stringsAsFactors = FALSE)
@@ -654,8 +654,9 @@ plot_direct_users <- function(start, end, country, events, path, dpi) {
         "https://metrics.torproject.org/", sep = ""),
         format = date_breaks$format, major = date_breaks$major,
         minor = date_breaks$minor) +
-    scale_y_continuous(name = "", limits = c(0, max(u$users,
-        na.rm = TRUE)), formatter = formatter) +
+    scale_y_continuous(name = "", limits = c(0,
+        ifelse(length(na.omit(u$users)) == 0, 0,
+        max(u$users, na.rm = TRUE))), formatter = formatter) +
     opts(title = title)
   print(plot)
   ggsave(filename = path, width = 8, height = 5, dpi = as.numeric(dpi))