[Dehs-devel] r86 - in trunk: . www
atomo64-guest at alioth.debian.org
atomo64-guest at alioth.debian.org
Fri Dec 21 02:01:39 UTC 2007
Author: atomo64-guest
Date: 2007-12-21 02:01:39 +0000 (Fri, 21 Dec 2007)
New Revision: 86
Modified:
trunk/update_wwwal.sh
trunk/www/stats.html
Log:
Added some more charts by making use of Google Charts API
Modified: trunk/update_wwwal.sh
===================================================================
--- trunk/update_wwwal.sh 2007-12-18 21:01:45 UTC (rev 85)
+++ trunk/update_wwwal.sh 2007-12-21 02:01:39 UTC (rev 86)
@@ -9,41 +9,48 @@
php4 -q $WORKDIR/www/no_watch.php > /org/alioth.debian.org/chroot/home/groups/dehs/htdocs/no_watch.html
php4 -q $WORKDIR/www/no_upstream.php > /org/alioth.debian.org/chroot/home/groups/dehs/htdocs/no_upstream.html
php4 -q $WORKDIR/www/no_updated.php > /org/alioth.debian.org/chroot/home/groups/dehs/htdocs/no_updated.html
-php4 -q $WORKDIR/www/stats.html > /org/alioth.debian.org/chroot/home/groups/dehs/htdocs/stats.html
psql -A -q -d dehs -c "SELECT name || ': N/A' FROM pkgs WHERE watch IS NULL OR watch='' AND dist='unstable' ORDER BY name ASC;" | egrep -v '\?column\?|rows\)' > /org/alioth.debian.org/chroot/home/groups/dehs/htdocs/no_watch.txt
psql -A -q -d dehs -c "SELECT name || ': Error' FROM pkgs WHERE up_version='' AND watch!='' AND dist='unstable' order by name asc;" | egrep -v '\?column\?|rows\)' > /org/alioth.debian.org/chroot/home/groups/dehs/htdocs/no_upstream.txt
psql -A -q -d dehs -c "SELECT name || ': ' || up_version FROM pkgs WHERE up_version!='' AND watch!='' AND dist='unstable' order by name asc;" | egrep -v '\?column\?|rows\)' > /org/alioth.debian.org/chroot/home/groups/dehs/htdocs/no_updated.txt
psql -A -q -d dehs -c "SELECT name || ': N/A' FROM pkgs WHERE watch IS NULL OR watch='' AND dist='unstable' UNION SELECT name || ': Error' FROM pkgs WHERE up_version='' AND watch!='' AND dist='unstable' UNION SELECT name || ': ' || up_version FROM pkgs WHERE up_version!='' AND watch!='' AND dist='unstable';" | egrep -v '\?column\?|rows\)' > /org/alioth.debian.org/chroot/home/groups/dehs/htdocs/dehs_debianqa.txt
STATS=/org/alioth.debian.org/chroot/home/groups/dehs/htdocs/dehs_stats.txt
-cat /dev/null > $STATS
-echo -n 'watch_count:' >> $STATS
-psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE watch!='';" | egrep -v '[^0-9]' >> $STATS
-echo -n 'watch_count_unstable:' >> $STATS
-psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE watch!='' AND dist='unstable';" | egrep -v '[^0-9]' >> $STATS
-echo -n 'watch_count_experimental:' >> $STATS
-psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE watch!='' AND dist='experimental';" | egrep -v '[^0-9]' >> $STATS
-echo -n 'no_watch_count:' >> $STATS
-psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE watch IS NULL OR watch='';" | egrep -v '[^0-9]' >> $STATS
-echo -n 'no_watch_count_unstable:' >> $STATS
-psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE (watch IS NULL OR watch='') AND dist='unstable';" | egrep -v '[^0-9]' >> $STATS
+cat /dev/null > $STATS.new
+echo -n 'watch_count:' >> $STATS.new
+psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE watch!='';" | egrep -v '[^0-9]' >> $STATS.new
+echo -n 'watch_count_unstable:' >> $STATS.new
+psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE watch!='' AND dist='unstable';" | egrep -v '[^0-9]' >> $STATS.new
+echo -n 'watch_count_experimental:' >> $STATS.new
+psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE watch!='' AND dist='experimental';" | egrep -v '[^0-9]' >> $STATS.new
+echo -n 'no_watch_count:' >> $STATS.new
+psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE watch IS NULL OR watch='';" | egrep -v '[^0-9]' >> $STATS.new
+echo -n 'no_watch_count_unstable:' >> $STATS.new
+psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE (watch IS NULL OR watch='') AND dist='unstable';" | egrep -v '[^0-9]' >> $STATS.new
echo -n 'no_watch_count_experimental:' >> $STATS
-psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE (watch IS NULL OR watch='') AND dist='experimental';" | egrep -v '[^0-9]' >> $STATS
-echo -n 'watch_failed:' >> $STATS
-psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE up_version='' AND watch!='';" | egrep -v '[^0-9]' >> $STATS
-echo -n 'watch_failed_unstable:' >> $STATS
-psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE up_version='' AND watch!='' AND dist='unstable';" | egrep -v '[^0-9]' >> $STATS
-echo -n 'watch_failed_experimental:' >> $STATS
-psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE up_version='' AND watch!='' AND dist='experimental';" | egrep -v '[^0-9]' >> $STATS
-echo -n 'wwiz_count:' >> $STATS
-psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE wwiz_type='watch';" | egrep -v '[^0-9]' >> $STATS
-echo -n 'wwiz_count_unstable:' >> $STATS
-psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE wwiz_type='watch' AND dist='unstable';" | egrep -v '[^0-9]' >> $STATS
-echo -n 'wwiz_count_experimental:' >> $STATS
-psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE wwiz_type='watch' AND dist='experimental';" | egrep -v '[^0-9]' >> $STATS
-echo -n 'updated_count:' >> $STATS
-psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE updated='f';" | egrep -v '[^0-9]' >> $STATS
-echo -n 'updated_count_unstable:' >> $STATS
-psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE updated='f' AND dist='unstable';" | egrep -v '[^0-9]' >> $STATS
-echo -n 'updated_count_experimental:' >> $STATS
-psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE updated='f' AND dist='experimental';" | egrep -v '[^0-9]' >> $STATS
\ No newline at end of file
+psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE (watch IS NULL OR watch='') AND dist='experimental';" | egrep -v '[^0-9]' >> $STATS.new
+echo -n 'watch_failed:' >> $STATS.new
+psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE up_version='' AND watch!='';" | egrep -v '[^0-9]' >> $STATS.new
+echo -n 'watch_failed_unstable:' >> $STATS.new
+psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE up_version='' AND watch!='' AND dist='unstable';" | egrep -v '[^0-9]' >> $STATS.new
+echo -n 'watch_failed_experimental:' >> $STATS.new
+psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE up_version='' AND watch!='' AND dist='experimental';" | egrep -v '[^0-9]' >> $STATS.new
+echo -n 'wwiz_count:' >> $STATS.new
+psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE wwiz_type='watch';" | egrep -v '[^0-9]' >> $STATS.new
+echo -n 'wwiz_count_unstable:' >> $STATS.new
+psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE wwiz_type='watch' AND dist='unstable';" | egrep -v '[^0-9]' >> $STATS.new
+echo -n 'wwiz_count_experimental:' >> $STATS.new
+psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE wwiz_type='watch' AND dist='experimental';" | egrep -v '[^0-9]' >> $STATS.new
+echo -n 'updated_count:' >> $STATS.new
+psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE updated='f';" | egrep -v '[^0-9]' >> $STATS.new
+echo -n 'updated_count_unstable:' >> $STATS.new
+psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE updated='f' AND dist='unstable';" | egrep -v '[^0-9]' >> $STATS.new
+echo -n 'updated_count_experimental:' >> $STATS.new
+psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE updated='f' AND dist='experimental';" | egrep -v '[^0-9]' >> $STATS.new
+echo -n 'updated_wwizz_count:' >> $STATS.new
+psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE updated='f' AND wwiz_type='watch';" | egrep -v '[^0-9]' >> $STATS.new
+echo -n 'updated_count_unstable:' >> $STATS.new
+psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE updated='f' AND dist='unstable' AND wwiz_type='watch';" | egrep -v '[^0-9]' >> $STATS.new
+echo -n 'updated_count_experimental:' >> $STATS.new
+psql -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE updated='f' AND dist='experimental' AND wwiz_type='watch';" | egrep -v '[^0-9]' >> $STATS.new
+mv $STATS.new $STATS
+php4 -q $WORKDIR/www/stats.html > /org/alioth.debian.org/chroot/home/groups/dehs/htdocs/stats.html "$STATS"
\ No newline at end of file
Modified: trunk/www/stats.html
===================================================================
--- trunk/www/stats.html 2007-12-18 21:01:45 UTC (rev 85)
+++ trunk/www/stats.html 2007-12-21 02:01:39 UTC (rev 86)
@@ -1,9 +1,30 @@
-<?php echo '<?xml version="1.0" encoding="iso-8859-1"?>'; ?>
+<?php echo '<?xml version="1.0" encoding="iso-8859-1"?>';
+
+function GCAPI_simpleEncoding($values, $maxValue) {
+ $charsList = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+ $chartData = array('s:');
+ for ($i = 0; $i < count($values); $i++) {
+ $currentValue = $values[$i];
+ if (is_numeric($currentValue) && $currentValue >= 0) {
+ $chartData[] = $charsList[round((strlen($charsList)-1) * $currentValue / $maxValue)];
+ } else {
+ $chartData[] = '_';
+ }
+ }
+ return implode('',$chartData);
+}
+
+$dehs_stats = file($argv[1]);
+foreach ($dehs_stats as $line) {
+ list($var, $val) = explode(':', $line);
+ $$var = $val;
+}
+
+?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
- <!--<link rel="stylesheet" href="http://www.debian.org/debian.css" type="text/css" />-->
<title>DEHS statistics</title>
<meta http-equiv="content-type" content="application/xhtml+xml; charset=iso-8859-1" />
<link rel="shortcut icon" href="/favicon.ico">
@@ -14,6 +35,20 @@
<?php $title='Overall DEHS statistics'; define('PBAR', true); include("menu.inc"); ?><br>
<table class="invisiblebox">
<tr>
+ <td colspan="2">Last run statistics</td>
+ </tr>
+ <tr>
+ <td><img src="http://chart.apis.google.com/chart?chs=495x162&chd=<?=GCAPI_simpleEncoding(array($watch_count, $no_watch_count), max(array($watch_count, $no_watch_count)))?>&cht=p3&chl=With+watch|Without+watch&chco=dd00dd,0000dd" alt="" width="493" height="162"/></td>
+ <td><img src="http://chart.apis.google.com/chart?chs=495x162&chd=s:<?=GCAPI_simpleEncoding(array($updated_count, ($watch_count + $no_watch_count) - $updated_count - $wwiz_count, $no_watch_count - $wwiz_count), max(array($updated_count, ($watch_count + $no_watch_count) - $updated_count - $wwiz_count, $no_watch_count - $wwiz_count)))?>&cht=p3&chl=Updated|Not+updated|Unable+to+tell" alt="" width="493" height="162"/></td>
+ </tr>
+ <tr>
+ <td><img src="http://chart.apis.google.com/chart?chs=495x162&chd=s:<?=GCAPI_simpleEncoding(array($watch_count, $watch_failed), max(array($watch_count, $watch_failed)))?>&cht=p3&chl=Working+watch|Bogus+watch&chco=45dd00,dd2a2a" alt="" width="493" height="162"/></td>
+ <td><img src="http://chart.apis.google.com/chart?chs=495x162&chd=s:<?=GCAPI_simpleEncoding(array($no_watch_count, $wwiz_count), max(array($no_watch_count, $wwiz_count)))?>&cht=p3&chl=Without+watch|WWizard-generated&chco=808080" alt="" width="493" height="162"/></td>
+ </tr>
+ <tr>
+ <td colspan="2">All time statistics</td>
+ </tr>
+ <tr>
<td><img src="/dehs-day.png" alt="daily graph" width="493" height="331"/></td>
<td><img src="/dehs-week.png" alt="weekly graph" width="493" height="331"/></td>
</tr>
@@ -23,7 +58,7 @@
</tr>
</table>
</div>
-<div style="text-align:center"><span>Thanks to Lucas Nussbaum for the graphics</span><br/>
+<div style="text-align:center"><span>Thanks to Lucas Nussbaum for the 'all time statistics' graphics</span><br/>
<span>The data used to generate the graphics is available at <a href="/dehs_stats.txt">dehs_stats.txt</a></span></div>
</body>
</html>
\ No newline at end of file
More information about the Dehs-devel
mailing list