@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | * @param string $query_string The term string |
| 34 | 34 | */ |
| 35 | 35 | function chamilo_get_boolean_query($term) { |
| 36 | - return xapian_get_boolean_query($term); |
|
| 36 | + return xapian_get_boolean_query($term); |
|
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | /** |
@@ -44,22 +44,22 @@ discard block |
||
| 44 | 44 | $results_by_tool = array(); |
| 45 | 45 | if (count($results)>0) { |
| 46 | 46 | |
| 47 | - foreach ($results as $key => $row) { |
|
| 48 | - $results_by_tool[$row['toolid']][] = $row; |
|
| 49 | - } |
|
| 47 | + foreach ($results as $key => $row) { |
|
| 48 | + $results_by_tool[$row['toolid']][] = $row; |
|
| 49 | + } |
|
| 50 | 50 | |
| 51 | - $processed_results = array(); |
|
| 52 | - foreach ($results_by_tool as $toolid => $rows) { |
|
| 53 | - $tool_processor_class = $toolid .'_processor'; |
|
| 54 | - $tool_processor_path = api_get_path(LIBRARY_PATH) .'search/tool_processors/'. $tool_processor_class .'.class.php'; |
|
| 55 | - if (file_exists($tool_processor_path)) { |
|
| 56 | - require_once($tool_processor_path); |
|
| 57 | - $tool_processor = new $tool_processor_class($rows); |
|
| 58 | - $processed_results = array_merge($tool_processor->process(), $processed_results); |
|
| 59 | - } |
|
| 60 | - } |
|
| 51 | + $processed_results = array(); |
|
| 52 | + foreach ($results_by_tool as $toolid => $rows) { |
|
| 53 | + $tool_processor_class = $toolid .'_processor'; |
|
| 54 | + $tool_processor_path = api_get_path(LIBRARY_PATH) .'search/tool_processors/'. $tool_processor_class .'.class.php'; |
|
| 55 | + if (file_exists($tool_processor_path)) { |
|
| 56 | + require_once($tool_processor_path); |
|
| 57 | + $tool_processor = new $tool_processor_class($rows); |
|
| 58 | + $processed_results = array_merge($tool_processor->process(), $processed_results); |
|
| 59 | + } |
|
| 60 | + } |
|
| 61 | 61 | |
| 62 | - return array(count($processed_results), $processed_results); |
|
| 62 | + return array(count($processed_results), $processed_results); |
|
| 63 | 63 | } |
| 64 | 64 | } |
| 65 | 65 | |
@@ -72,5 +72,5 @@ discard block |
||
| 72 | 72 | * @return XapianQuery query joined |
| 73 | 73 | */ |
| 74 | 74 | function chamilo_join_queries($query1, $query2=NULL, $op='or') { |
| 75 | - return xapian_join_queries($query1, $query2, $op); |
|
| 75 | + return xapian_join_queries($query1, $query2, $op); |
|
| 76 | 76 | } |
@@ -1,9 +1,9 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /* For licensing terms, see /license.txt */ |
| 3 | 3 | /** |
| 4 | - * Index page of the admin tools |
|
| 5 | - * @package chamilo.admin |
|
| 6 | - */ |
|
| 4 | + * Index page of the admin tools |
|
| 5 | + * @package chamilo.admin |
|
| 6 | + */ |
|
| 7 | 7 | // Resetting the course id. |
| 8 | 8 | $cidReset = true; |
| 9 | 9 | |