Escape $1 in message (was PHP syntax error)

[lhc/web/wiklou.git] / includes / api / ApiOpenSearch.php

diff --git a/includes/api/ApiOpenSearch.php b/includes/api/ApiOpenSearch.php
index 9e5afcb..4a673c2 100644 (file)
--- a/includes/api/ApiOpenSearch.php
+++ b/includes/api/ApiOpenSearch.php
@@ -1,12 +1,11 @@
 <?php
 
-
 /*
  * Created on Oct 13, 2006
  *
  * API for MediaWiki 1.8+
  *
- * Copyright (C) 2006 Yuri Astrakhan <FirstnameLastname@gmail.com>
+ * Copyright (C) 2006 Yuri Astrakhan <Firstname><Lastname>@gmail.com
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,6 +28,9 @@ if (!defined('MEDIAWIKI')) {
        require_once ("ApiBase.php");
 }
 
+/**
+ * @ingroup API
+ */
 class ApiOpenSearch extends ApiBase {
 
        public function __construct($main, $action) {
@@ -40,36 +42,15 @@ class ApiOpenSearch extends ApiBase {
        }
 
        public function execute() {
-               $search = null;
-               extract($this->ExtractRequestParams());
-
-               $title = Title :: newFromText($search);
-               if(!$title)
-                       return; // Return empty result
-                       
-               // Prepare nested request
-               $params = new FauxRequest(array (
-                       'action' => 'query',
-                       'list' => 'allpages',
-                       'apnamespace' => $title->getNamespace(),
-                       'aplimit' => 10,
-                       'apprefix' => $title->getDBkey()
-               ));
-
-               // Execute
-               $module = new ApiMain($params);
-               $module->execute();
-
-               // Get resulting data
-               $data = & $module->getResultData();
+               $params = $this->extractRequestParams();
+               $search = $params['search'];
+               $limit = $params['limit'];
+               $namespaces = $params['namespace'];
+               
+               // Open search results may be stored for a very long time
+               $this->getMain()->setCacheMaxAge(1200);
 
-               // Reformat useful data for future printing by JSON engine
-               $srchres = array ();
-               foreach ($data['query']['allpages'] as $pageid => & $pageinfo) {
-                       // Note: this data will no be printable by the xml engine
-                       // because it does not support lists of unnamed items
-                       $srchres[] = $pageinfo['title'];
-               }
+               $srchres = PrefixSearch::titleSearch( $search, $limit, $namespaces );
 
                // Set top level elements
                $result = $this->getResult();
@@ -77,19 +58,33 @@ class ApiOpenSearch extends ApiBase {
                $result->addValue(null, 1, $srchres);
        }
 
-       protected function getAllowedParams() {
+       public function getAllowedParams() {
                return array (
-                       'search' => null
+                       'search' => null,
+                       'limit' => array (
+                               ApiBase :: PARAM_DFLT => 10,
+                               ApiBase :: PARAM_TYPE => 'limit',
+                               ApiBase :: PARAM_MIN => 1,
+                               ApiBase :: PARAM_MAX => 100,
+                               ApiBase :: PARAM_MAX2 => 100
+                       ),
+                       'namespace' => array(
+                               ApiBase :: PARAM_DFLT => NS_MAIN,
+                               ApiBase :: PARAM_TYPE => 'namespace',
+                               ApiBase :: PARAM_ISMULTI => true
+                       ),
                );
        }
 
-       protected function getParamDescription() {
+       public function getParamDescription() {
                return array (
-                       'search' => 'Search string'
+                       'search' => 'Search string',
+                       'limit' => 'Maximum amount of results to return',
+                       'namespace' => 'Namespaces to search',
                );
        }
 
-       protected function getDescription() {
+       public function getDescription() {
                return 'This module implements OpenSearch protocol';
        }
 
@@ -103,4 +98,3 @@ class ApiOpenSearch extends ApiBase {
                return __CLASS__ . ': $Id$';
        }
 }
-?>
\ No newline at end of file