MDL-55287 search: Custom error message if solr extension is not insta…

…lled Correcting engine is not installed lang string as well.
moodle · Jul 27, 2016 · e240a61 · e240a61
1 parent 379ca98
commit e240a61
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/lang/en/search.php b/lang/en/search.php
@@ -47,7 +47,7 @@
 $string['duration'] = 'Duration';
 $string['emptydatabaseerror'] = 'Database table is not present, or contains no index records.';
 $string['enginenotfound'] = 'Engine {$a} not found.';
-$string['enginenotinstalled'] = 'Engine {$a} not installed.';
+$string['enginenotinstalled'] = 'Engine {$a} is not installed.';
 $string['enginenotselected'] = 'You have not selected any search engine.';
 $string['engineserverstatus'] = 'The search engine is not available. Please contact your administrator.';
 $string['enteryoursearchquery'] = 'Enter your search query';

diff --git a/lib/adminlib.php b/lib/adminlib.php
@@ -9741,7 +9741,11 @@ public function output_html($data, $query='') {
                             array('href' => $url));
             // Check the engine status.
             $searchengine = \core_search\manager::search_engine_instance();
-            $serverstatus = $searchengine->is_server_ready();
+            try {
+                $serverstatus = $searchengine->is_server_ready();
+            } catch (\moodle_exception $e) {
+                $serverstatus = $e->getMessage();
+            }
             if ($serverstatus === true) {
                 $status = html_writer::tag('span', get_string('yes'), array('class' => 'statusok'));
             } else {

diff --git a/search/engine/solr/classes/engine.php b/search/engine/solr/classes/engine.php
@@ -1160,6 +1160,10 @@ protected function get_search_client($triggerexception = true) {
             'timeout' => !empty($this->config->server_timeout) ? $this->config->server_timeout : '30'
         );
 
+        if (!class_exists('\SolrClient')) {
+            throw new \core_search\engine_exception('enginenotinstalled', 'search', '', 'solr');
+        }
+
         $client = new \SolrClient($options);
 
         if ($client === false && $triggerexception) {