Merge pull request #9 from FynskeMedier/master

Fix for dead indexes.

handlers/test.php

@@ -0,0 +1,4 @@
+<?php
+require('shutdown.php');
+trigger_error("Wazzup from " . exec('hostname -f'));
+

modules/Api/Public/Model/Line.php

@@ -350,7 +350,8 @@ public static function getTotal($path = null, $level = null, $handled = false) {
 	private static function _getByPrefix($prefix, $offset, $limit, $path = null, $level = null, $handled = false) {
 		$redis = self::_getIndexingRedis();
 		$start = $offset;
-		$end   = $start + ($limit - 1);
+		// We fetch more results from redis than we need, in case we need to discard some of them
+		$end   = $start + $limit * 2;
 
 		$id = uniqid(self::SEARCH_PREFIX, true);
 
@@ -376,7 +377,19 @@ private static function _getByPrefix($prefix, $offset, $limit, $path = null, $le
 
 		$result = array();
 		foreach ($redis->zRevRange($id, $start, $end) as $key) {
-			$result[] = new ApiPublicModelLine($key);
+			try {
+				$modelLine = new ApiPublicModelLine($key);
+				$result[] = $modelLine;
+				if (count($result) >= $limit) {
+					// We don't need any more results
+					break;
+				}
+			} catch (RuntimeException $e) {
+				// Key not found, remove from indexes
+				foreach ($zinters as $inter) {
+					$redis->zRem($inter, $key);
+				}
+			}
 		}
 
 		$redis->del($id);