List:Commits« Previous MessageNext Message »
From:Hakan Kuecuekyilmaz Date:November 4 2008 8:32pm
Subject:bzr commit into mysql-falcon branch (hky:300)
View as plain text  
#At bzr+ssh://bk-internal.mysql.com/bzrroot/mysql-falcon/

  300 Hakan Kuecuekyilmaz	2008-11-04 [merge]
      Process placeholders for reporting period
      and CSV archive.
modified:
  falcon_bug_statistic/falcon_bug_statistic.php
  falcon_bug_statistic/falcon_bug_statistic_text.php
  falcon_bug_statistic/fbs.css
  falcon_bug_statistic/monthly_falcon_bug_statistic.sh
  falcon_bug_statistic/weekly_falcon_bug_statistic.sh

per-file messages:
  falcon_bug_statistic/falcon_bug_statistic.php
    Merge.
  falcon_bug_statistic/falcon_bug_statistic_text.php
    Added placeholders for reporting period
    and links to CSV files.
  falcon_bug_statistic/fbs.css
    Merge.
  falcon_bug_statistic/monthly_falcon_bug_statistic.sh
    Process placeholders for reporting period
    and CSV archive.
  falcon_bug_statistic/weekly_falcon_bug_statistic.sh
    Process placeholders for reporting period
    and CSV archive.
=== modified file 'falcon_bug_statistic/falcon_bug_statistic.php'
--- a/falcon_bug_statistic/falcon_bug_statistic.php	2008-10-01 10:37:36 +0000
+++ b/falcon_bug_statistic/falcon_bug_statistic.php	2008-11-04 19:29:13 +0000
@@ -69,7 +69,7 @@ $spacer16 = '                ';
 <div class="fbs">
     <table class="container">
         <tr>
-            <td style="border: none; vertical-align: top;">
+            <td style="border: none; padding-bottom: 1.5em;">
             <div class="sorted">
             <table class="table-autosort table-stripeclass:alternate">
                 <thead>
@@ -112,16 +112,18 @@ $spacer16 = '                ';
                 echo $spacer16 . '    </tr>' . "\n";
                 echo $spacer16 . '</tfoot>' . "\n";
                 ?>
-            </table></div></td>
+            </table>
+            </div></td>
 
-            <td style="border: none; vertical-align: top;">
+            <td rowspan="5" style="border: none; padding-bottom: 1.5em; vertical-align: top;">
             <div class="sorted">
             <table class="table-autosort table-stripeclass:alternate">
                 <thead>
                     <tr>
-                        <th colspan="2">Active Falcon Bugs</th>
+                        <th colspan="3">Active Falcon Bugs</th>
                     </tr>
                     <tr class="alternate">
+                        <th class="table-sortable:numeric"><h3>Priority</h3></th>
                         <th class="table-sortable:default"><h3>Status</h3></th>
                         <th class="table-sortable:numeric"><h3>Count</h3></th>
                     </tr>
@@ -131,17 +133,18 @@ $spacer16 = '                ';
                 $sum = 0;
 
                 echo '<tbody>' . "\n";
-                while ($row = mysql_fetch_assoc($res_stat)) {
+                while ($row = mysql_fetch_assoc($res_prio_stat)) {
                     $i++;
                     $sum += $row['count'];
-                    $url = sprintf(URL, 'all', '&status=' . $row['status'], '', '', '');
+                    $url = sprintf(URL, '-' . $row['priority'], '&status=' . $row['status'], '', '', '');
 
                     if ($i % 2) {
                         echo $spacer16 . '    <tr>' . "\n";
                     } else {
                         echo $spacer16 . '    <tr class="alternate">' . "\n";
                     }
-                    echo $spacer16 . '        <td><a href="' . $url . '">' . $row['status'] . '</a></td>' . "\n";
+                    echo $spacer16 . '        <td><a href="' . $url . '">' . $row['priority'] . '</a></td>' . "\n";
+                    echo $spacer16 . '        <td>' . $row['status'] . '</td>' . "\n";
                     echo $spacer16 . '        <td>' . $row['count'] . '</td>' . "\n";
                     echo $spacer16 . '    </tr>' . "\n";
                 }
@@ -150,22 +153,25 @@ $spacer16 = '                ';
                 $url = sprintf(URL, 'all', $status_active_url, '', '', '');
                 echo $spacer16 . '<tfoot>' . "\n";
                 echo $spacer16 . '    <tr>' . "\n";
-                echo $spacer16 . '        <td><a href="' . $url . '"><strong>All</strong><span><pre>' . $sql_stat . '</pre></span></a></td>' . "\n";
+                echo $spacer16 . '        <td><a href="' . $url . '"><strong>All</strong><span><pre>' . $sql_prio_stat . '</pre></span></a></td>' . "\n";
+                echo $spacer16 . '        <td>&nbsp;</td>' . "\n";
                 echo $spacer16 . '        <td><strong>' . $sum . '</strong></td>' . "\n";
                 echo $spacer16 . '    </tr>' . "\n";
                 echo $spacer16 . '</tfoot>' . "\n";
                 ?>
-            </table></div></td>
+            </table>
+            </div></td>
+        </tr>
 
-            <td rowspan="2" style="border: none; vertical-align: top;">
+        <tr>
+            <td style="border: none; padding-bottom: 1.5em;">
             <div class="sorted">
             <table class="table-autosort table-stripeclass:alternate">
                 <thead>
                     <tr>
-                        <th colspan="3">Active Falcon Bugs</th>
+                        <th colspan="2">Active Falcon Bugs</th>
                     </tr>
                     <tr class="alternate">
-                        <th class="table-sortable:numeric"><h3>Priority</h3></th>
                         <th class="table-sortable:default"><h3>Status</h3></th>
                         <th class="table-sortable:numeric"><h3>Count</h3></th>
                     </tr>
@@ -175,18 +181,17 @@ $spacer16 = '                ';
                 $sum = 0;
 
                 echo '<tbody>' . "\n";
-                while ($row = mysql_fetch_assoc($res_prio_stat)) {
+                while ($row = mysql_fetch_assoc($res_stat)) {
                     $i++;
                     $sum += $row['count'];
-                    $url = sprintf(URL, '-' . $row['priority'], '&status=' . $row['status'], '', '', '');
+                    $url = sprintf(URL, 'all', '&status=' . $row['status'], '', '', '');
 
                     if ($i % 2) {
                         echo $spacer16 . '    <tr>' . "\n";
                     } else {
                         echo $spacer16 . '    <tr class="alternate">' . "\n";
                     }
-                    echo $spacer16 . '        <td><a href="' . $url . '">' . $row['priority'] . '</a></td>' . "\n";
-                    echo $spacer16 . '        <td>' . $row['status'] . '</td>' . "\n";
+                    echo $spacer16 . '        <td><a href="' . $url . '">' . $row['status'] . '</a></td>' . "\n";
                     echo $spacer16 . '        <td>' . $row['count'] . '</td>' . "\n";
                     echo $spacer16 . '    </tr>' . "\n";
                 }
@@ -195,17 +200,17 @@ $spacer16 = '                ';
                 $url = sprintf(URL, 'all', $status_active_url, '', '', '');
                 echo $spacer16 . '<tfoot>' . "\n";
                 echo $spacer16 . '    <tr>' . "\n";
-                echo $spacer16 . '        <td><a href="' . $url . '"><strong>All</strong><span><pre>' . $sql_prio_stat . '</pre></span></a></td>' . "\n";
-                echo $spacer16 . '        <td>&nbsp;</td>' . "\n";
+                echo $spacer16 . '        <td><a href="' . $url . '"><strong>All</strong><span><pre>' . $sql_stat . '</pre></span></a></td>' . "\n";
                 echo $spacer16 . '        <td><strong>' . $sum . '</strong></td>' . "\n";
                 echo $spacer16 . '    </tr>' . "\n";
                 echo $spacer16 . '</tfoot>' . "\n";
                 ?>
-            </table></div></td>
+            </table>
+            </div></td>
         </tr>
 
-        </tr>
-            <td style="border: none; vertical-align: top;">
+        <tr>
+            <td style="border: none; padding-bottom: 1.5em;">
             <div class="sorted">
             <table class="table-autosort table-stripeclass:alternate">
                 <thead>
@@ -249,9 +254,12 @@ $spacer16 = '                ';
                 echo $spacer16 . '    </tr>' . "\n";
                 echo $spacer16 . '</tfoot>' . "\n";
                 ?>
-            </table></div></td>
+            </table>
+            </div></td>
+        </tr>
 
-            <td style="border: none; vertical-align: top;">
+        <tr>
+            <td style="border: none; padding-bottom: 1.5em;">
             <div class="sorted">
             <table class="table-autosort table-stripeclass:alternate">
                 <thead>
@@ -295,11 +303,12 @@ $spacer16 = '                ';
                 echo $spacer16 . '    </tr>' . "\n";
                 echo $spacer16 . '</tfoot>' . "\n";
                 ?>
-            </table></div></td>
+            </table>
+            </div></td>
         </tr>
 
         <tr>
-            <td style="border: none; vertical-align: top;">
+            <td style="border: none; padding-bottom: 1.5em;">
             <div class="sorted">
             <table class="table-autosort table-stripeclass:alternate">
                 <thead>
@@ -341,7 +350,8 @@ $spacer16 = '                ';
                 echo $spacer16 . '    </tr>' . "\n";
                 echo $spacer16 . '</tfoot>' . "\n";
                 ?>
-            </table></div></td>
+            </table>
+            </div></td>
         </tr>
 
     </table>

=== modified file 'falcon_bug_statistic/falcon_bug_statistic_text.php'
--- a/falcon_bug_statistic/falcon_bug_statistic_text.php	2008-10-31 12:28:49 +0000
+++ b/falcon_bug_statistic/falcon_bug_statistic_text.php	2008-11-04 20:32:22 +0000
@@ -73,7 +73,7 @@ $hre_ipsoad = "\n" . str_repeat(' ', $ih
 /**
  * Text output.
  */
-echo 'Falcon Bug Statistic' . "\n";
+echo 'PERIOD_PLACEHOLDER Falcon Bug Statistic' . "\n";
 echo 'Generated at: ' . THIS_DATE . "\n";
 echo "\n";
 
@@ -81,9 +81,8 @@ echo 'Interactive version can be found a
 echo 'https://intranet.mysql.com/~hakank/fbs/falcon_bug_statistic.php' . "\n";
 echo "\n";
 
-echo 'CSV versions can be found at:' . "\n";
-echo 'https://intranet.mysql.com/~hakank/fbs/weekly_stats.tar.gz' . "\n";
-echo 'https://intranet.mysql.com/~hakank/fbs/monthly_stats.tar.gz' . "\n";
+echo 'CSV version can be found at:' . "\n";
+echo 'URL_PLACEHOLDER' . "\n";
 echo "\n";
 
 /**

=== modified file 'falcon_bug_statistic/fbs.css'
--- a/falcon_bug_statistic/fbs.css	2008-10-06 15:35:34 +0000
+++ b/falcon_bug_statistic/fbs.css	2008-11-04 19:29:13 +0000
@@ -62,7 +62,6 @@ table.container {
 th, td  {
     border: 1px solid #000000;
     padding: 2px 15px 2px 15px;
-    vertical-align: bottom;
 }
 
 div.sorted thead tr {

=== modified file 'falcon_bug_statistic/monthly_falcon_bug_statistic.sh'
--- a/falcon_bug_statistic/monthly_falcon_bug_statistic.sh	2008-09-12 04:22:09 +0000
+++ b/falcon_bug_statistic/monthly_falcon_bug_statistic.sh	2008-11-04 20:32:22 +0000
@@ -1,9 +1,15 @@
 #!/bin/bash
 # 01 00 1 * * $HOME/bin/monthly_falcon_bug_statistic.sh
 #
+EMAIL='dev-falcon@stripped'
+PERIOD='Monthly'
+TIMESTAMP=$(date +%Y-%m)
+URL="https:\/\/intranet.mysql.com\/~hakank\/fbs\/monthly_stats_${TIMESTAMP}.tar.gz"
+
 cd $HOME/work
 scp -p -r production.mysql.com:~/work/mysql-falcon/falcon_bug_statistic .
 cd falcon_bug_statistic
-/usr/local/bin/php falcon_bug_statistic_text.php last_month | mail -s"Monthly Falcon Bug Statistic as of $(date)" dev-falcon@stripped
-tar zcvf monthly_stats.tar.gz *.tab
-scp -p monthly_stats.tar.gz production.mysql.com:~/public_html/fbs
+/usr/local/bin/php falcon_bug_statistic_text.php last_month | sed -e "s/URL_PLACEHOLDER/${URL}/g" | sed -e "s/PE
+RIOD_PLACEHOLDER/${PERIOD}/g" | mail -s"Monthly Falcon Bug Statistic as of $(date)" $EMAIL
+tar zcvf monthly_stats_${TIMESTAMP}.tar.gz *.tab
+scp -p monthly_stats_${TIMESTAMP}.tar.gz production.mysql.com:~/public_html/fbs

=== modified file 'falcon_bug_statistic/weekly_falcon_bug_statistic.sh'
--- a/falcon_bug_statistic/weekly_falcon_bug_statistic.sh	2008-09-12 04:22:09 +0000
+++ b/falcon_bug_statistic/weekly_falcon_bug_statistic.sh	2008-11-04 20:32:22 +0000
@@ -1,9 +1,14 @@
 #!/bin/bash
 # 00 06 * * 5 $HOME/bin/weekly_falcon_bug_statistic.sh; cd $HOME/work/mysql-falcon/falcon_bug_statistic; /usr/local/bin/php falcon_bug_inflow_last_seven_days.php >> $HOME/falcon_bug_inflow.txt
 #
+EMAIL='dev-falcon@stripped'
+PERIOD='Weekly'
+TIMESTAMP=$(date +%Y-%m-%d)
+URL="https:\/\/intranet.mysql.com\/~hakank\/fbs\/weekly_stats_${TIMESTAMP}.tar.gz"
+
 cd $HOME/work
 scp -p -r production.mysql.com:~/work/mysql-falcon/falcon_bug_statistic .
 cd falcon_bug_statistic
-/usr/local/bin/php falcon_bug_statistic_text.php | mail -s"Weekly Falcon Bug Statistic as of $(date)" dev-falcon@stripped
-tar zcvf weekly_stats.tar.gz *.tab
-scp -p weekly_stats.tar.gz production.mysql.com:~/public_html/fbs
+/usr/local/bin/php falcon_bug_statistic_text.php | sed -e "s/URL_PLACEHOLDER/${URL}/g" | sed -e "s/PERIOD_PLACEHOLDER/${PERIOD}/g" | mail -s"Weekly Falcon Bug Statistic as of $(date)" $EMAIL
+tar zcvf weekly_stats_${TIMESTAMP}.tar.gz *.tab
+scp -p weekly_stats_${TIMESTAMP}.tar.gz production.mysql.com:~/public_html/fbs

Thread
bzr commit into mysql-falcon branch (hky:300) Hakan Kuecuekyilmaz4 Nov