[Dehs-devel] r151 - in trunk: . www

atomo64-guest at alioth.debian.org atomo64-guest at alioth.debian.org
Thu Jul 10 03:27:20 UTC 2008 

Author: atomo64-guest
Date: 2008-07-10 03:27:19 +0000 (Thu, 10 Jul 2008)
New Revision: 151

Modified:
   trunk/update_wwwal.sh
   trunk/www/stats.html
Log:
Statistics corrections and better charts


Modified: trunk/update_wwwal.sh
===================================================================
--- trunk/update_wwwal.sh	2008-07-10 02:39:17 UTC (rev 150)
+++ trunk/update_wwwal.sh	2008-07-10 03:27:19 UTC (rev 151)
@@ -44,11 +44,17 @@
 echo -n 'no_watch_count_experimental:' >> $STATS.new
 psql -A -q -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 -c "SELECT COUNT(id) FROM pkgs WHERE up_version='' AND watch!='';" | egrep -v '[^0-9]' >> $STATS.new
+psql -A -q -c "SELECT COUNT(id) FROM pkgs WHERE up_version='' AND watch!='' AND watch_warn !='';" | egrep -v '[^0-9]' >> $STATS.new
 echo -n 'watch_failed_unstable:' >> $STATS.new
-psql -A -q -c "SELECT COUNT(id) FROM pkgs WHERE up_version='' AND watch!='' AND dist='unstable';" | egrep -v '[^0-9]' >> $STATS.new
+psql -A -q -c "SELECT COUNT(id) FROM pkgs WHERE up_version='' AND watch!='' AND dist='unstable' AND watch_warn !='';" | egrep -v '[^0-9]' >> $STATS.new
 echo -n 'watch_failed_experimental:' >> $STATS.new
-psql -A -q -c "SELECT COUNT(id) FROM pkgs WHERE up_version='' AND watch!='' AND dist='experimental';" | egrep -v '[^0-9]' >> $STATS.new
+psql -A -q -c "SELECT COUNT(id) FROM pkgs WHERE up_version='' AND watch!='' AND dist='experimental' AND watch_warn !='';" | egrep -v '[^0-9]' >> $STATS.new
+echo -n 'watch_empty:' >> $STATS.new
+psql -A -q -c "SELECT COUNT(id) FROM pkgs WHERE up_version='' AND watch!='' AND (watch_warn ='' OR watch_warn IS NULL);" | egrep -v '[^0-9]' >> $STATS.new
+echo -n 'watch_empty_unstable:' >> $STATS.new
+psql -A -q -c "SELECT COUNT(id) FROM pkgs WHERE up_version='' AND watch!='' AND dist='unstable' AND (watch_warn ='' OR watch_warn IS NULL);" | egrep -v '[^0-9]' >> $STATS.new
+echo -n 'watch_empty_experimental:' >> $STATS.new
+psql -A -q -c "SELECT COUNT(id) FROM pkgs WHERE up_version='' AND watch!='' AND dist='experimental' AND (watch_warn ='' OR watch_warn IS NULL);" | egrep -v '[^0-9]' >> $STATS.new
 echo -n 'wwiz_count:' >> $STATS.new
 psql -A -q -c "SELECT COUNT(id) FROM pkgs WHERE wwiz_type='watch';" | egrep -v '[^0-9]' >> $STATS.new
 echo -n 'wwiz_count_unstable:' >> $STATS.new

Modified: trunk/www/stats.html
===================================================================
--- trunk/www/stats.html	2008-07-10 02:39:17 UTC (rev 150)
+++ trunk/www/stats.html	2008-07-10 03:27:19 UTC (rev 151)
@@ -38,11 +38,12 @@
       <td colspan="2">Last run statistics</td>
     </tr>
     <tr>
-      <td><img src="http://chart.apis.google.com/chart?chs=495x162&amp;chd=<?=GCAPI_simpleEncoding(array($watch_count, $no_watch_count), max(array($watch_count, $no_watch_count)))?>&amp;cht=p3&amp;chl=With+watch|Without+watch&amp;chco=dd00dd,0000dd" alt="" width="493"  height="162"/></td>
-      <td><img src="http://chart.apis.google.com/chart?chs=495x162&amp;chd=<?=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)))?>&amp;cht=p3&amp;chl=Updated|Not+updated|Unable+to+tell" alt="" width="493"  height="162"/></td>
+      <td><img src="http://chart.apis.google.com/chart?chs=495x162&amp;chd=<?=GCAPI_simpleEncoding(array($watch_count, $no_watch_count), max(array($watch_count, $no_watch_count)))?>&amp;cht=p3&amp;chl=With+watch|Without+watch&amp;chco=57c7e9,353f9a" alt="" width="493"  height="162"/></td>
+      <td><img src="http://chart.apis.google.com/chart?chs=495x162&amp;chd=<?=GCAPI_simpleEncoding(array($updated_real_count,$updated_wwiz_count,($watch_count - $updated_real_count - $watch_empty),($wwiz_count - $updated_wwiz_count),($no_watch_count - $wwiz_count)), max(array($updated_real_count,$updated_wwiz_count,($watch_count - $updated_real_count - $watch_empty),($wwiz_count - $updated_wwiz_count),($no_watch_count - $wwiz_count))))?>&amp;cht=p3&amp;chl=Up-to-date|WWiz+up-to-date|Not+up-to-date|WWiz+not+up-to-date|Unable+to+tell" alt="" width="493"  height="162"/></td>
+      <!--<td><img src="http://chart.apis.google.com/chart?chs=495x162&amp;chd=<?=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)))?>&amp;cht=p3&amp;chl=Up-to-date|Not+up-to-date|Unable+to+tell" alt="" width="493"  height="162"/></td>-->
     </tr>
     <tr>
-      <td><img src="http://chart.apis.google.com/chart?chs=495x162&amp;chd=<?=GCAPI_simpleEncoding(array($watch_count, $watch_failed), max(array($watch_count, $watch_failed)))?>&amp;cht=p3&amp;chl=Working+watch|Bogus+watch&amp;chco=45dd00,dd2a2a" alt="" width="493"  height="162"/></td>
+      <td><img src="http://chart.apis.google.com/chart?chs=495x162&amp;chd=<?=GCAPI_simpleEncoding(array($watch_count, $watch_empty,$watch_failed), max(array($watch_count,$watch_empty, $watch_failed)))?>&amp;cht=p3&amp;chl=Working+watch|Empty+watch|Bogus+watch&amp;chco=45dd00,da9a1a,dd2a2a" alt="" width="493"  height="162"/></td>
       <td><img src="http://chart.apis.google.com/chart?chs=495x162&amp;chd=<?=GCAPI_simpleEncoding(array($no_watch_count, $wwiz_count), max(array($no_watch_count, $wwiz_count)))?>&amp;cht=p3&amp;chl=Without+watch|WWizard-generated&amp;chco=808080" alt="" width="493"  height="162"/></td>
     </tr>
     <tr>

More information about the Dehs-devel mailing list