add paged provider

1 files changed, 25 insertions, 2 deletions

diff --git a/lib/private/search.php b/lib/private/search.php
index 8f04aa8360b..4629d52b40e 100644
--- a/lib/private/search.php
+++ b/lib/private/search.php
@@ -21,6 +21,7 @@
  */
 
 namespace OC;
+use OCP\Search\PagedProvider;
 use OCP\Search\Provider;
 use OCP\ISearch;
 
@@ -39,12 +40,34 @@ class Search implements ISearch {
 	 * @return array An array of OC\Search\Result's
 	 */
 	public function search($query, array $inApps = array()) {
+		return $this->searchPaged($query, $inApps, 0, 0);
+	}
+
+	/**
+	 * Search all providers for $query
+	 * @param string $query
+	 * @param int $page
+	 * @param int $size, 0 = all
+	 * @return array An array of OC\Search\Result's
+	 */
+	public function searchPaged($query, $page = 0, $size = 30) {
 		$this->initProviders();
 		$results = array();
 		foreach($this->providers as $provider) {
 			/** @var $provider Provider */
-			if ($provider->providesResultsFor($inApps)) {
-				$results = array_merge($results, $provider->search($query));
+			if ( ! $provider->providesResultsFor($inApps) ) {
+				continue;
+			}
+			if ($provider instanceof PagedProvider) {
+				$results = array_merge($results, $provider->searchPaged($query, $page, $size));
+			} else if ($provider instanceof Provider) {
+				$providerResults = $provider->search($query);
+				if ($size > 0) {
+					$slicedResults = array_slice($providerResults, $page * $size, $size);
+				}
+				$results = array_merge($results, $slicedResults);
+			} else {
+				\OC::$server->getLogger()->warning('Ignoring Unknown search provider', array('provider' => $provider));
 			}
 		}
 		return $results;