Author: vip
Date: Wed May 16 16:06:14 2007
New Revision: 8561
Modified:
toys/stbr/index.php
toys/stbr/queue.php
Log:
- simplified $this variables
- added query flags (test build or upgrade)
- get rid of comments
Modified: toys/stbr/index.php
==============================================================================
--- toys/stbr/index.php (original)
+++ toys/stbr/index.php Wed May 16 16:06:14 2007
@@ -1,6 +1,6 @@
<?
ob_start("ob_gzhandler");
-$db = sqlite_open("../ApHeX/scripts/stbrlog.db");
+$db = sqlite_open("../db/stbrlog.db");
include("queue.php");
@@ -101,7 +101,7 @@
<table>
<?
$inner = "SELECT application.recipient as arecipient, application.spec as
aspec, ";
-$inner .= " builder, queue_requester, queue_date ";
+$inner .= " builder, queue_requester, queue_date, queue_flags ";
$inner .= "FROM application ";
$inner .= "LEFT JOIN status ";
$inner .= "ON (application.spec=status.spec AND application.date=status.date)
";
@@ -119,10 +119,10 @@
{
$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']}'";
+ $insert .= "'{$p['date']}','{$q['aspec']}',
'{$filled['requester']}','{$filled['date']}', '{$filled['flags']}'";
$insert .= ");";
sqlite_exec($db, $insert);
- $filled = $filled['requester'] . '/' . $filled['date'];
+ $filled = $filled['requester'] . '/' . $filled['date']
. '/' . $filled['flags'];
}
else
{
@@ -131,7 +131,7 @@
}
else
{
- $filled = $q['queue_requester'] . '/' .$q['queue_date'];
+ $filled = $q['queue_requester'] . '/' .$q['queue_date'] . '/' .
$q['queue_flags'];
}
$q['who'] = $q['arecipient'];
Modified: toys/stbr/queue.php
==============================================================================
--- toys/stbr/queue.php (original)
+++ toys/stbr/queue.php Wed May 16 16:06:14 2007
@@ -1,7 +1,6 @@
<?
// Builder queue parser class
// Piotr Budny, vip at pld-linux dot org
-//
class Queue
{
@@ -46,17 +45,16 @@
foreach($this->queue as $group)
{
- $this->queue_requster = (string)$group->requester;
- $this->queue_date = (int)$group->time;
- $this->queue_spec = (string)$group->batch->spec;
+ $queue_requster = (string)$group->requester;
+ $queue_date = (int)$group->time;
+ $queue_spec = (string)$group->batch->spec;
+ $queue_flags = (string)$group->Attributes()->flags;
- if($spec['spec'] != $this->queue_spec)
+ if($spec['spec'] != $queue_spec)
continue;
- //echo date("Y-m-d H:i:s", $this->queue_date) . "\n";
-
- if($spec['date'] < $this->queue_date)
- $result = array('date' => $this->queue_date,
'requester' => $this->queue_requster);
+ if($spec['date'] < $queue_date)
+ $result = array('date' => $queue_date,
'requester' => $queue_requster, 'flags' => $queue_flags);
}
return $result;
@@ -71,22 +69,13 @@
}
}
-
- //array_walk($specs, 'convert_to_timestamp');
-
function is_filled($spec)
{
$status = array();
-
$this->prepare_queue_data();
-
$spec['date'] = strtotime($spec['date']);
-
-// echo "Searching " . $spec['spec'] . " (>" . $spec['date'] . ")
in queue...\n";
-
$status = $this->queue_search_recursive($spec);
- //echo "Found filled req: " . $spec['spec'] . " (".
$spec['date'] .") with queue entry: " . $status['requester'] . " (" .
$status['date'] . ")\n";
return $status;
}
}
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
