[Piuparts-commits] rev 763 - trunk

[Holger Levsen]

Author: holger
Date: 2010-11-13 19:36:30 +0000 (Sat, 13 Nov 2010)
New Revision: 763

Modified:
   trunk/piuparts-report.py
Log:
2nd part of r762

Modified: trunk/piuparts-report.py
===================================================================
--- trunk/piuparts-report.py	2010-11-13 19:26:05 UTC (rev 762)
+++ trunk/piuparts-report.py	2010-11-13 19:36:30 UTC (rev 763)
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 #
 # Copyright 2005 Lars Wirzenius (liw at iki.fi)
-# Copyright 2009 Holger Levsen (holger at layer-acht.org)
+# Copyright 2009-2010 Holger Levsen (holger at layer-acht.org)
 # 
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the
@@ -662,7 +662,7 @@
         dirs = ""
 
         if state == "successfully-tested":
-          dirs = ["pass", "fixed"]
+          dirs = ["pass"]
         elif state == "failed-testing":
           dirs = ["fail", "bugged"]
         elif state == "cannot-be-tested":
@@ -876,14 +876,14 @@
         r('t <- (read.table("'+countsfile+'",sep=",",header=1,row.names=1))')
         r('cname <- c("date",rep(colnames(t)))')
         # here we define how many days we wants stats for (163=half a year)
-        #r('v <- t[(nrow(t)-163):nrow(t),0:12]')
+        #r('v <- t[(nrow(t)-163):nrow(t),0:10]')
         # make graph since day 1  
-        r('v <- t[0:nrow(t),0:12]')
+        r('v <- t[0:nrow(t),0:10]')
         # thanks to http://tango.freedesktop.org/Generic_Icon_Theme_Guidelines for those nice colors
-        r('palette(c("#4e9a06", "#ef2929", "#73d216", "#d3d7cf", "#5c3566", "#c4a000", "#fce94f", "#a40000", "#888a85", "#2e3436", "#8ae234",  "#729fcf","#204a87"))')
+        r('palette(c("#4e9a06", "#ef2929", "#d3d7cf", "#5c3566", "#c4a000", "#fce94f", "#a40000", "#888a85", "#2e3436", "#729fcf", "#204a87"))')
         r('bitmap(file="'+pngfile+'",type="png16m",width=16,height=9,pointsize=10,res=100)')
-        r('barplot(t(v),col = 1:13, main="Binary packages per state in '+self._config.section+'", xlab="", ylab="Number of binary packages",space=0.1,border=0)')
-        r('legend(x="bottom",legend=colnames(t), ncol=2,fill=1:13,xjust=0.5,yjust=0,bty="n")')
+        r('barplot(t(v),col = 1:11, main="Binary packages per state in '+self._config.section+'", xlab="", ylab="Number of binary packages",space=0.1,border=0)')
+        r('legend(x="bottom",legend=colnames(t), ncol=2,fill=1:11,xjust=0.5,yjust=0,bty="n")')
         return "<tr class=\"normalrow\"> <td class=\"contentcell2\" colspan=\"3\"><a href=\"%s\"><img src=\"/%s/%s\" height=\"450\" width=\"800\" alt=\"Binary package states in %s\"></a></td></tr>\n" % ("states.png", self._config.section, "states.png", self._config.section)
 
     def create_and_link_to_analysises(self,state):
@@ -1000,7 +1000,7 @@
 
     def generate_html(self):
         logging.debug("Finding log files")
-        dirs = ["pass", "fail", "bugged", "fixed", "reserved", "untestable"]
+        dirs = ["pass", "fail", "bugged", "reserved", "untestable"]
         logs_by_dir = {}
         for dir in dirs:
             logs_by_dir[dir] = find_files_with_suffix(dir, ".log")