Author: vip
Date: Mon May 21 13:18:39 2007
New Revision: 8615

Modified:
   toys/stbr/README
   toys/stbr/index.php
Log:
- add builder info to db
- cache fetched queue entries to the db


Modified: toys/stbr/README
==============================================================================
--- toys/stbr/README    (original)
+++ toys/stbr/README    Mon May 21 13:18:39 2007
@@ -36,6 +36,7 @@
        queue_requester varchar(100),
        queue_date datetime,
        queue_flags varchar(30),
+       queue_builder_info text,
        primary key (date,spec,branch));"
 
 It sucks, but the database & directory with the db need to be world writable.

Modified: toys/stbr/index.php
==============================================================================
--- toys/stbr/index.php (original)
+++ toys/stbr/index.php Mon May 21 13:18:39 2007
@@ -247,13 +247,14 @@
 {
        
 $inner  = "SELECT application.recipient as arecipient, application.spec as 
aspec, application.branch AS abranch, ";
-$inner .= " builder, queue_requester, queue_date, queue_flags ";
+$inner .= " builder, queue_requester, queue_date, queue_flags, 
queue_builder_info ";
 $inner .= "FROM application ";
 $inner .= "LEFT JOIN status ";
 $inner .= "ON (application.spec=status.spec AND application.date=status.date 
AND application.branch=status.branch) ";
 $inner .= "WHERE application.date='{$p['date']}' ";
 $inner .= "ORDER BY application.date DESC";
 
+//echo $inner;
 $inner = sqlite_query($db, $inner);
 $rows = sqlite_num_rows($inner) + 1;
 ?>
@@ -267,48 +268,44 @@
 
 while($q = sqlite_fetch_array($inner))
 {
-       $filled = $queue->is_filled(array('spec' => $q['aspec'], 'date' => 
$p['date']));
+       $title = '';
 
-       /* temporal disable
        if(empty($q['queue_requester']) && empty($q['queue_date']))
        {
                $filled = $queue->is_filled(array('spec' => $q['aspec'], 'date' 
=> $p['date']));
+               
                if(count($filled))
                {
                        $filled['date'] = date("d.m.Y H:i:s", $filled['date']);
 
-                       $insert = "INSERT INTO status VALUES (";
-                       $insert .= "'{$p['date']}','{$q['aspec']}', 
'{$filled['requester']}','{$filled['date']}', '{$filled['flags']}'";
-                       $insert .= ");";
-                       sqlite_exec($db, $insert);
-                       $filled = $filled['requester'] . '/' . $filled['date'] 
. '/' . $filled['flags'];
+                       foreach($filled['builder'] as $key => $value)
+                       {
+                               $title .= "$value @ $key [br/]";
+                       }
+                       
+                       $insert = 'INSERT INTO status VALUES ("';
+                       $insert .= $p['date'] . '","' . $q['aspec'] .'","';
+                       $insert .= $q['abranch'] . '","'; 
+                       $insert .= $filled['requester'] . '","' . 
$filled['date'] . '","';
+                       $insert .= $filled['flags'] . '","' . $title;
+                       $insert .= '");';
+                       $insert = sqlite_escape_string($insert);
+                       sqlite_exec($db, $insert, $err);
+                       echo $err;
+                       
+                       $title = "onmouseover=\"O(event, this, '$title')\"";
+                       
+                       $info = '<a class="mailto">' . $filled['requester'] . 
'</a> / ' . $filled['flags'] . '<br />' . $filled['date'];
                }
                else
                {
-                       $filled = "not sent";
-               }
-       }
-       else
-       {
-               $filled = $q['queue_requester'] . '/' .$q['queue_date'] . '/' . 
$q['queue_flags'];
-       }
-       */
-
-       $title = '';
-
-       if(count($filled))
-       {
-               $filled['date'] = date("d.m.Y H:i:s", $filled['date']);
-               $info = '<a class="mailto">' . $filled['requester'] . '</a> / ' 
. $filled['flags'] . '<br />' . $filled['date'];
-               foreach($filled['builder'] as $key => $value)
-               {
-                       $title .= "$value @ $key [br/]";
+                       $info = "not filled";
                }
-               $title = "onmouseover=\"O(event, this, '$title')\"";
        }
        else
        {
-               $info = "not filled";
+               $info = '<a class="mailto">' . $q['queue_requester'] . '</a> / 
' . $q['queue_flags'] . '<br />' . $q['queue_date'];
+               $title = "onmouseover=\"O(event, this, 'Cached: 
[br/]{$q['queue_builder_info']}')\"";
        }
 ?>
 <tr class="application" <?=$title?>>
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to