|
@@ -196,7 +196,7 @@ function materio_search_api_results_search(){
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+ // dsm($ret, 'ret');
|
|
|
return $ret;
|
|
|
}
|
|
|
|
|
@@ -342,6 +342,23 @@ function msa_solrquery_breves($typed, $language, $user, $offset, $limit){
|
|
|
$results = $query->execute();
|
|
|
// dsm($results, 'results');
|
|
|
|
|
|
+ $results['index'] = $index;//search_api_index_load($index_machine_name);
|
|
|
+
|
|
|
+
|
|
|
+ #could
|
|
|
+ $could_index_machine_name = variable_get('fulltextsearchindex_'.$language->language, -1);
|
|
|
+ $could_index = search_api_index_load($could_index_machine_name);
|
|
|
+
|
|
|
+
|
|
|
+ # in case of free user search, run a real search to indicate how much items you could find
|
|
|
+ $could_query = search_api_query($could_index_machine_name, array('conjunction'=>'OR', 'parse mode'=>'direct'))
|
|
|
+ ->keys($typed);
|
|
|
+
|
|
|
+ $could_results = $could_query->execute();
|
|
|
+ // dsm($could_results, 'could_results');
|
|
|
+ $results['could results'] = $could_results;
|
|
|
+
|
|
|
+ # add items : breve + materials wich are in the could result
|
|
|
$items = array();
|
|
|
$breves = $index->loadItems(array_keys($results['results']));
|
|
|
foreach ($breves as $nid => $breve) {
|
|
@@ -367,26 +384,7 @@ function msa_solrquery_breves($typed, $language, $user, $offset, $limit){
|
|
|
$results['breves count'] = $results['result count'];
|
|
|
$results['result count'] = count($items);
|
|
|
|
|
|
- #could
|
|
|
- $could_index_machine_name = variable_get('fulltextsearchindex_'.$language->language, -1);
|
|
|
- $could_index = search_api_index_load($could_index_machine_name);
|
|
|
-
|
|
|
-
|
|
|
- # in case of free user search, run a real search to indicate how much items you could find
|
|
|
- $could_query = search_api_query($could_index_machine_name, array('conjunction'=>'OR', 'parse mode'=>'direct'))
|
|
|
- // ->keys(implode(' ', $keys))
|
|
|
- ->keys($typed);
|
|
|
- // ->range($offset, $limit);
|
|
|
- // ->filter($filter);
|
|
|
-
|
|
|
- $could_results = $could_query->execute();
|
|
|
- // dsm($could_results, 'could_results');
|
|
|
- $results['could results'] = $could_results;
|
|
|
-
|
|
|
-
|
|
|
- //$results['#index'] = $index;//search_api_index_load($index_machine_name);
|
|
|
-
|
|
|
-
|
|
|
+ // dsm($results, "results");
|
|
|
# TODO: cache the results with cache graceful : http://drupal.org/project/cache_graceful
|
|
|
return $results;
|
|
|
}
|