From 38648c1670754cc2a602ea5f451e83b926ee6d3f Mon Sep 17 00:00:00 2001 From: Bachir Soussi Chiadmi Date: Sat, 7 Oct 2017 20:29:58 +0200 Subject: [PATCH] advenced search block is in place, remains to build the whole logic --- .../materiobasemod/materio_search_api.module | 39 ++++++++++++------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/sites/all/modules/gui/materiobasemod/materio_search_api.module b/sites/all/modules/gui/materiobasemod/materio_search_api.module index 335ce772..7fbd1d23 100755 --- a/sites/all/modules/gui/materiobasemod/materio_search_api.module +++ b/sites/all/modules/gui/materiobasemod/materio_search_api.module @@ -443,6 +443,7 @@ function materio_search_api_term_property_dup_name($term){ return $term->name_field[$lang][0]['value']; } + // function materio_search_api_term_property_name_translated($term){ // if($term->vid == 4){ // print_r(get_defined_vars()); @@ -458,10 +459,12 @@ function materio_search_api_term_property_dup_name($term){ // } // } -/** - * - - -- - - - - - - blocks - - - - - - - - - - - - * - */ + +// ____ __ __ +// / __ )/ /___ _____/ /_______ +// / __ / / __ \/ ___/ //_/ ___/ +// / /_/ / / /_/ / /__/ ,< (__ ) +// /_____/_/\____/\___/_/|_/____/ /** * Implements hook_block_info(). @@ -472,7 +475,7 @@ function materio_search_api_block_info() { 'cache' => DRUPAL_NO_CACHE ); - $blocks['materio_search_api_advanced_search'] = array( + $blocks['mo_searchapi_advanced_search'] = array( 'info' => t('Materio search api advanced search'), 'cache' => DRUPAL_NO_CACHE ); @@ -506,7 +509,7 @@ function materio_search_api_block_view($delta = '') { $block['content'] = theme('materio_search_api_search_block', array()); } break; - case 'materio_search_api_advanced_search': + case 'mo_searchapi_advanced_search': if (user_access('use materio advanced search')) { $block['subject'] = t('Advanced Search'); $block['content'] = theme('materio_search_api_advanced_search_block', array()); @@ -726,7 +729,7 @@ function materio_search_api_search_form_submit($form, &$form_state){ /** - * materiobase_search_form() + * materio_search_api_advanced_search_form() */ function materio_search_api_advanced_search_form($form, &$form_state){ // dsm($form_state, 'form_state'); @@ -747,10 +750,19 @@ function materio_search_api_advanced_search_form($form, &$form_state){ $form['actu'] = array( '#type' => 'markup', '#markup' => $link, - //'' ); } + $form['searchfield'] = array( + '#type' => 'textfield', + '#default_value' => $path == 'explore' ? $keys : $default_value, // TODO: set the search page path global or a variable in settings + // '#autocomplete_path' => 'materiosearchapi/autocomplete/searchapi', + //'#autocomplete_path' => 'materiosearchapi/autocomplete/dbselect', + '#size' => 30, + '#maxlength' => 1024, + '#attributes' => array("default"=>$default_value), + ); + $form['create'] = array( '#type' => 'image_button', @@ -872,6 +884,7 @@ function template_preprocess_materio_search_api_advanced_search_block(&$vars){ $vars['searchform'] = drupal_get_form("materio_search_api_advanced_search_form"); } + function template_preprocess_materio_search_api_select_viewmode_block(&$vars){ global $user; @@ -1041,11 +1054,11 @@ function template_preprocess_materio_search_api_actuality(&$vars){ // $vars['actualities_infos'] = t('Actualities by materiO\''); $vars['actualities_infos'] = t(''); } - -function template_preprocess_materio_search_api_advanced_search_block(&$vars){ - // dsm($vars, "vars"); - $vars['searchform'] = drupal_get_form("materio_search_api_advanced_search_form"); -} +// +// function template_preprocess_materio_search_api_advanced_search_block(&$vars){ +// // dsm($vars, "vars"); +// $vars['searchform'] = drupal_get_form("materio_search_api_advanced_search_form"); +// } function theme_materio_search_api_form_element($variables) { // dsm($variables, 'variables');