X-Git-Url: https://git.donarmstrong.com/?p=bugscan.git;a=blobdiff_plain;f=dograph;h=ba6b822ea793fa6ba1cb7ad36d30db28bfaf5e54;hp=182cb8555023d002e94192fe8e530a47a33e1024;hb=bded608382f38fcda99ad65d56307ca7d818a607;hpb=d5a0b74a3ddd8ad47fb594e890dfd0f454627655

diff --git a/dograph b/dograph
index 182cb85..ba6b822 100755
--- a/dograph
+++ b/dograph
@@ -6,12 +6,14 @@ cd /org/bugs.debian.org/bugscan
 
 tmp=`tempfile`
 tmp2=`tempfile`
+tmp3=`tempfile`
 
-find counts -type f | sort | xargs grep '^' /dev/null |
+find counts -type f -not -iname '*.bad'| sort | xargs grep '^' /dev/null |
     sed 's/^.*count-//;s/ .*$//;s/:/ /' >"$tmp"
-find counts -type f | sort | xargs egrep '^(.* ){6}' /dev/null |
-    sed 's/^.*count-//;s/:.* / /;' >"$tmp2"
-    
+find counts -type f -not -iname '*.bad'| sort | xargs egrep '^(.* ){6}' /dev/null | tr ":-" " " |
+    cut -d" " -f2,9 >"$tmp2"
+find counts -type f -not -iname '*.bad'| sort | xargs egrep '^(.* ){7}' /dev/null | tr ":-" " " |
+    cut -d" " -f2,10 >"$tmp3"
 
 #for i in counts/count-[0-9]* ; do
 #	date=`echo $i | sed -e s/.*count-//`
@@ -19,6 +21,12 @@ find counts -type f | sort | xargs egrep '^(.* ){6}' /dev/null |
 #	echo $date $count >> ${tmp}2
 #done
 
+# This is the date of the wheezy release
+previous_release="201305040600"
+
+# And this is a month ago
+previous_month=`date +"%Y%m%d%H%M" --date="1 month ago"`
+
 cat <<EOF | gnuplot
 set xdata time
 set timefmt "%Y%m%d%H%M"
@@ -30,8 +38,15 @@ set yrange [0:]
 #set xtics 2678400
 #set nomxtics
 set output "/org/bugs.debian.org/www/bugscan/graph.png"
-plot "$tmp" using 1:2 with lines, "$tmp2" using 1:2 with lines
+plot "$tmp" using 1:2 with lines, "$tmp2" using 1:2 with lines, "$tmp3" using 1:2 with lines
+set xrange ["$previous_release":]
+set output "/org/bugs.debian.org/www/bugscan/graph-release.png"
+plot "$tmp" using 1:2 with lines, "$tmp2" using 1:2 with lines, "$tmp3" using 1:2 with lines
+set xrange ["$previous_month":]
+set format x "%d\n%m\n%Y"
+set output "/org/bugs.debian.org/www/bugscan/graph-month.png"
+plot "$tmp" using 1:2 with lines, "$tmp2" using 1:2 with lines, "$tmp3" using 1:2 with lines
 quit
 EOF
 
-rm "$tmp" "$tmp2"
+rm "$tmp" "$tmp2" "$tmp3"