SVN: toys/stbr: index.php queue.php

[vip]

Author: vip
Date: Tue Nov 27 15:31:00 2007
New Revision: 9108

Modified:
   toys/stbr/index.php
   toys/stbr/queue.php
Log:
- match build type, request can be filled at same time as request


Modified: toys/stbr/index.php
==============================================================================
--- toys/stbr/index.php	(original)
+++ toys/stbr/index.php	Tue Nov 27 15:31:00 2007
@@ -324,7 +324,7 @@
 
 	if(empty($q['queue_requester']) && empty($q['queue_date']))
 	{
-		$filled = $queue->is_filled(array('spec' => $q['aspec'], 'date' => $p['date']));
+		$filled = $queue->is_filled(array('spec' => $q['aspec'], 'date' => $p['date'], 'builder' => $q['builder']));
 		
 		if(count($filled))
 		{

Modified: toys/stbr/queue.php
==============================================================================
--- toys/stbr/queue.php	(original)
+++ toys/stbr/queue.php	Tue Nov 27 15:31:00 2007
@@ -56,8 +56,11 @@
 		
 				if($spec['spec'] != $queue_spec)
 					continue;
+				
+				if($spec['builder'] != $queue_flags)
+					continue;
 	
-				if($spec['date'] < $queue_date)
+				if($spec['date'] <= $queue_date)
 				{
 					$builder = array();