X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FQueue_item.php;h=f83c2cef184d49f868d712a82a016fefa34d4c68;hb=ef3b849db05ff6ad4b9e97b38a82242a710519d1;hp=1b34d8ab448f2ee0c0032089f4a665e9f0048329;hpb=04ef1ba8eee7a9e2a565d7b4b747ef607665d562;p=quix0rs-gnu-social.git

diff --git a/classes/Queue_item.php b/classes/Queue_item.php
index 1b34d8ab44..f83c2cef18 100644
--- a/classes/Queue_item.php
+++ b/classes/Queue_item.php
@@ -4,16 +4,16 @@
  */
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Queue_item extends Memcached_DataObject 
+class Queue_item extends Memcached_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
 
     public $__table = 'queue_item';                      // table name
-    public $notice_id;                       // int(4)  primary_key not_null
-    public $transport;                       // varchar(8)  primary_key not_null
+    public $id;                              // int(4)  primary_key not_null
+    public $frame;                           // blob not_null
     public $created;                         // datetime()   not_null
-    public $claimed;                         // datetime()  
+    public $claimed;                         // datetime()
 
     /* Static get */
     function staticGet($k,$v=null)
@@ -22,25 +22,35 @@ class Queue_item extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
-    function sequenceKey()
-    { return array(false, false); }
-    
-    static function top($transport) {
+    /**
+     * @param mixed $transports name of a single queue or array of queues to pull from
+     *                          If not specified, checks all queues in the system.
+     */
+    static function top($transports=null) {
 
         $qi = new Queue_item();
-        $qi->transport = $transport;
+        if ($transports) {
+            if (is_array($transports)) {
+                // @fixme use safer escaping
+                $list = implode("','", array_map('addslashes', $transports));
+                $qi->whereAdd("transport in ('$list')");
+            } else {
+                $qi->transport = $transports;
+            }
+        }
         $qi->orderBy('created');
         $qi->whereAdd('claimed is null');
 
         $qi->limit(1);
 
-        $cnt = $qi->find(TRUE);
+        $cnt = $qi->find(true);
 
         if ($cnt) {
             # XXX: potential race condition
             # can we force it to only update if claimed is still null
             # (or old)?
-            common_log(LOG_INFO, 'claiming queue item = ' . $qi->notice_id . ' for transport ' . $transport);
+            common_log(LOG_INFO, 'claiming queue item id = ' . $qi->id .
+                ' for transport ' . $qi->transport);
             $orig = clone($qi);
             $qi->claimed = common_sql_now();
             $result = $qi->update($orig);