bachir/materio-base-legacy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

code cleaning

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi 2014-09-27 09:58:09 +08:00
parent 0bba2d0657
commit 1cc9a63c46
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
materio_search_api.module
View File

@ -445,6 +445,7 @@ function materio_search_api_block_info() {
'cache' => DRUPAL_NO_CACHE 'cache' => DRUPAL_NO_CACHE
); );
# NOT USED
$blocks['materio_search_api_viewmode'] = array( $blocks['materio_search_api_viewmode'] = array(
'info' => t('Materio search api view mode selection'), 'info' => t('Materio search api view mode selection'),
'cache' => DRUPAL_NO_CACHE 'cache' => DRUPAL_NO_CACHE
@ -494,6 +495,8 @@ function materio_search_api_block_view($delta = '') {
// $block['content'] = theme('materio_search_api_filters_block', array()); // $block['content'] = theme('materio_search_api_filters_block', array());
// } // }
// break; // break;
# NOT USED
case 'materio_sa_adv_search': case 'materio_sa_adv_search':
if(user_access('use materio search api advanced search')){ if(user_access('use materio search api advanced search')){
$block['subject'] = t('Advanced Search'); $block['subject'] = t('Advanced Search');
@ -675,7 +678,7 @@ function materio_search_api_search_form_submit($form, &$form_state){
/** /**
* materiobase_search_form() * materiobase_advancedsearch_form()
*/ */
function materio_search_api_advanced_search_form($form, &$form_state){ function materio_search_api_advanced_search_form($form, &$form_state){
// dsm($form_state, 'form_state'); // dsm($form_state, 'form_state');
@ -839,11 +842,11 @@ function materio_search_api_advanced_search_form_validate($form, &$form_state){
} }
function materio_search_api_advanced_search_form_submit($form, &$form_state){ function materio_search_api_advanced_search_form_submit($form, &$form_state){
dsm($form, 'form'); // dsm($form, 'form');
dsm($form_state, 'form_state'); // dsm($form_state, 'form_state');
$fs_values = $form_state['values']['slider']; $fs_values = $form_state['values']['slider'];
unset($fs_values['show']); unset($fs_values['show']);
dsm($fs_values, 'values'); // dsm($fs_values, 'values');
foreach($fs_values as $voc => $trees){ foreach($fs_values as $voc => $trees){
foreach($trees as $tree => $values){ foreach($trees as $tree => $values){

6
materio_search_api.pages.inc
View File

@ -159,7 +159,7 @@ function materio_search_api_results_search(){
} }
else if(user_access('use materio search api')){ else if(user_access('use materio search api')){
// dsm('normal search'); // dsm('normal search');
// switch index depending on key words type full text or taxonomy term (autocomplete selection) # switch index depending on key words type full text or taxonomy term (autocomplete selection)
$searchmode = isset($user->data['materiosearchapi_searchmode']) ? $user->data['materiosearchapi_searchmode'] : "fulltext"; $searchmode = isset($user->data['materiosearchapi_searchmode']) ? $user->data['materiosearchapi_searchmode'] : "fulltext";
switch($searchmode){ switch($searchmode){
case "fulltext": case "fulltext":
@ -180,13 +180,13 @@ function materio_search_api_results_search(){
} }
if(!user_access('use materio search api advanced search') && !user_access('use materio search api')){ if(!user_access('use materio search api advanced search') && !user_access('use materio search api')){
// potential results index for anonymous and free user # potential results index for anonymous and free user
$could_index_machine_name = variable_get('mainsearchindex_'.$language->language, -1); $could_index_machine_name = variable_get('mainsearchindex_'.$language->language, -1);
$could_index = search_api_index_load($index_machine_name); $could_index = search_api_index_load($index_machine_name);
} }
if ($typed) { if ($typed) {
// TODO: cache the results with cache graceful : http://drupal.org/project/cache_graceful # TODO: cache the results with cache graceful : http://drupal.org/project/cache_graceful
try { try {
# retrieve viewmode and then use it to define the query range # retrieve viewmode and then use it to define the query range