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

[atomo64-guest at alioth.debian.org]

Author: atomo64-guest
Date: 2008-07-10 03:36:53 +0000 (Thu, 10 Jul 2008)
New Revision: 152

Modified:
   trunk/update_wwwal.sh
   trunk/www/stats.html
Log:
Don't use fictitious, moving updated_real_count as updated_count.
Major statistics correction.


Modified: trunk/update_wwwal.sh
===================================================================
--- trunk/update_wwwal.sh	2008-07-10 03:27:19 UTC (rev 151)
+++ trunk/update_wwwal.sh	2008-07-10 03:36:53 UTC (rev 152)
@@ -62,16 +62,10 @@
 echo -n 'wwiz_count_experimental:' >> $STATS.new
 psql -A -q -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 -c "SELECT COUNT(id) FROM pkgs WHERE updated='1';" | egrep -v '[^0-9]' >> $STATS.new
-echo -n 'updated_count_unstable:' >> $STATS.new
-psql -A -q -c "SELECT COUNT(id) FROM pkgs WHERE updated='1' AND dist='unstable';" | egrep -v '[^0-9]' >> $STATS.new
-echo -n 'updated_count_experimental:' >> $STATS.new
-psql -A -q -c "SELECT COUNT(id) FROM pkgs WHERE updated='1' AND dist='experimental';" | egrep -v '[^0-9]' >> $STATS.new
-echo -n 'updated_real_count:' >> $STATS.new
 psql -A -q -c "SELECT COUNT(id) FROM pkgs WHERE updated='1' AND up_version!='';" | egrep -v '[^0-9]' >> $STATS.new
-echo -n 'updated_real_count_unstable:' >> $STATS.new
+echo -n 'updated_count_unstable:' >> $STATS.new
 psql -A -q -c "SELECT COUNT(id) FROM pkgs WHERE updated='1' AND up_version!='' AND dist='unstable';" | egrep -v '[^0-9]' >> $STATS.new
-echo -n 'updated_real_count_experimental:' >> $STATS.new
+echo -n 'updated_count_experimental:' >> $STATS.new
 psql -A -q -c "SELECT COUNT(id) FROM pkgs WHERE updated='1' AND up_version!='' AND dist='experimental';" | egrep -v '[^0-9]' >> $STATS.new
 echo -n 'updated_wwiz_count:' >> $STATS.new
 psql -A -q -c "SELECT COUNT(id) FROM pkgs WHERE updated='1' AND wwiz_type='watch';" | egrep -v '[^0-9]' >> $STATS.new

Modified: trunk/www/stats.html
===================================================================
--- trunk/www/stats.html	2008-07-10 03:27:19 UTC (rev 151)
+++ trunk/www/stats.html	2008-07-10 03:36:53 UTC (rev 152)
@@ -39,7 +39,7 @@
     </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=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,$updated_wwiz_count,($watch_count - $updated_count - $watch_empty),($wwiz_count - $updated_wwiz_count),($no_watch_count - $wwiz_count + $watch_empty + $watch_failed)), max(array($updated_count,$updated_wwiz_count,($watch_count - $updated_count - $watch_empty),($wwiz_count - $updated_wwiz_count),($no_watch_count - $wwiz_count + $watch_empty + $watch_failed))))?>&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>