|
@@ -156,7 +156,6 @@ function materio_search_api_results_search(){
|
|
|
|
|
|
global $language;
|
|
|
|
|
|
-
|
|
|
// if(user_access('use materio search api')){
|
|
|
|
|
|
// }else if(user_access('use materio search api for breves')){
|
|
@@ -169,7 +168,7 @@ function materio_search_api_results_search(){
|
|
|
switch($searchmode){
|
|
|
case "fulltext":
|
|
|
default:
|
|
|
- $index_machine_name = variable_get('materiaux_breves_'.$language->language, -1);
|
|
|
+ $index_machine_name = variable_get('mainsearchindex_'.$language->language, -1);
|
|
|
break;
|
|
|
// case "taxonomy":
|
|
|
// $index_machine_name = variable_get('taxonomysearchindex_'.$language->language, -1);
|
|
@@ -236,7 +235,8 @@ function materio_search_api_results_search(){
|
|
|
}
|
|
|
catch (SearchApiException $e) {
|
|
|
$ret['message'] = t('An error occurred while executing the search. Please try again or contact the site administrator if the problem persists.');
|
|
|
- watchdog('materiobasemod', 'An error occurred while executing a search: !msg.', array('!msg' => $e->getMessage()), WATCHDOG_ERROR, l(t('search page'), $_GET['q']));
|
|
|
+ watchdog('materiobasemod', 'search error: !msg.', array('!msg' => $e->getMessage()), WATCHDOG_ERROR, l(t('search page'), $_GET['q']));
|
|
|
+ watchdog('materiobasemod', 'search error: !language.', array('!language' => print_r($language, true)), WATCHDOG_ERROR, l(t('search page'), $_GET['q']));
|
|
|
}
|
|
|
|
|
|
// dsm($results, 'results');
|