[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[33687] branches/7.x/lib

[<lph...@us...>]

Revision: 33687
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=33687&view=rev
Author:   lphuberdeau
Date:     2011-03-28 16:20:26 +0000 (Mon, 28 Mar 2011)

Log Message:
-----------
[FIX] Clear the pending incremental queue before rebuilding the index to avoid re-indexing the same objects again once completed

Modified Paths:
--------------
    branches/7.x/lib/queuelib.php
    branches/7.x/lib/search/searchlib-unified.php

Modified: branches/7.x/lib/queuelib.php
===================================================================
--- branches/7.x/lib/queuelib.php	2011-03-28 16:15:32 UTC (rev 33686)
+++ branches/7.x/lib/queuelib.php	2011-03-28 16:20:26 UTC (rev 33687)
@@ -23,6 +23,13 @@
 		));
 	}
 
+	function clear($queue)
+	{
+		$this->queue->deleteMultiple(array(
+			'queue' => $queue,
+		));
+	}
+
 	function pull($queue, $count = 1)
 	{
 		$handler = uniqid();

Modified: branches/7.x/lib/search/searchlib-unified.php
===================================================================
--- branches/7.x/lib/search/searchlib-unified.php	2011-03-28 16:15:32 UTC (rev 33686)
+++ branches/7.x/lib/search/searchlib-unified.php	2011-03-28 16:20:26 UTC (rev 33687)
@@ -53,6 +53,7 @@
 		}
 
 		// Build in -new
+		TikiLib::lib('queue')->clear(self::INCREMENT_QUEUE);
 		$indexer = $this->buildIndexer($index);
 		$stat = $indexer->rebuild();
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.