From 728540f2f422ce1974e1382ceced5984fe8c526c Mon Sep 17 00:00:00 2001 From: lLefevre Date: Mon, 21 Nov 2011 10:23:19 +0000 Subject: [PATCH] // fix bug : delete submit button and merge fieldset in AdminSearchConfController --- .../admin/AdminSearchConfController.php | 140 ++++++++++++++---- 1 file changed, 108 insertions(+), 32 deletions(-) diff --git a/controllers/admin/AdminSearchConfController.php b/controllers/admin/AdminSearchConfController.php index 448af1147..002d7b6b8 100644 --- a/controllers/admin/AdminSearchConfController.php +++ b/controllers/admin/AdminSearchConfController.php @@ -34,8 +34,10 @@ class AdminSearchConfControllerCore extends AdminController parent::__construct(); - $currentFileName = array_reverse(explode("/", $_SERVER['SCRIPT_NAME'])); - $cron_url = Tools::getHttpHost(true, true).__PS_BASE_URI__.substr($_SERVER['SCRIPT_NAME'], strlen(__PS_BASE_URI__), -strlen($currentFileName['0'])).'searchcron.php?full=1&token='.substr(_COOKIE_KEY_, 34, 8); + $current_file_name = array_reverse(explode('/', $_SERVER['SCRIPT_NAME'])); + $cron_url = Tools::getHttpHost(true, true).__PS_BASE_URI__. + substr($_SERVER['SCRIPT_NAME'], strlen(__PS_BASE_URI__), -strlen($current_file_name['0'])). + 'searchcron.php?full=1&token='.substr(_COOKIE_KEY_, 34, 8); list($total, $indexed) = Db::getInstance()->getRow('SELECT COUNT(*) as "0", SUM(indexed) as "1" FROM '._DB_PREFIX_.'product'); $this->options = array( @@ -44,51 +46,125 @@ class AdminSearchConfControllerCore extends AdminController 'icon' => 'search', 'info' => $this->l('The "indexed" products have been analysed by PrestaShop and will appear in the results of the front office search.').'
- '.$this->l('Indexed products:').' '.(int)($indexed).' / '.(int)($total).'. + '.$this->l('Indexed products:').' '.(int)$indexed.' / '.(int)$total.'.

-

'.$this->l('Building the product index can take a few minutes or more. If your server stop the process before it ends, you can resume the indexation by clicking "Add missing products".').'

- -> '.$this->l('Add missing products to index.').'
- -> '.$this->l('Re-build entire index.').'

+

'.$this->l('Building the product index can take a few minutes or more. + If your server stop the process before it ends, you can resume the indexation by clicking "Add missing products".').'

+ -> '. + $this->l('Add missing products to index.').'
+ -> '. + $this->l('Re-build entire index.').'

'.$this->l('You can set a cron job that will re-build your index using the following URL:').' '.$cron_url.'' ), 'search' => array( 'title' => $this->l('Search'), 'icon' => 'search', - 'class' => 'width2', 'fields' => array( - 'PS_SEARCH_AJAX' => array('title' => $this->l('Ajax search'), 'validation' => 'isBool', 'type' => 'bool', 'cast' => 'intval', - 'desc' => $this->l('Enable the ajax search for your visitors.').'
'.$this->l('With the ajax search, the first 10 products matching the user query will appear in real time below the input field.')), - 'PS_INSTANT_SEARCH' => array('title' => $this->l('Instant search:'), 'validation' => 'isBool', 'cast' => 'intval', 'type' => 'bool', - 'desc' => $this->l('Enable the instant search for your visitors.').'
'.$this->l('With the instant search, the results will appear immediatly while the user write his query.')), - 'PS_SEARCH_MINWORDLEN' => array('title' => $this->l('Minimum word length'), 'desc' => $this->l('Only words from this size will be indexed.'), 'size' => 4, 'validation' => 'isUnsignedInt', 'type' => 'text', 'cast' => 'intval'), - 'PS_SEARCH_BLACKLIST' => array('title' => $this->l('Blacklisted words'), 'size' => 35, 'validation' => 'isGenericName', 'desc' => $this->l('Please enter the words separated by a "|".'), 'type' => 'textLang') + 'PS_SEARCH_AJAX' => array( + 'title' => $this->l('Ajax search'), + 'validation' => 'isBool', + 'type' => 'bool', + 'cast' => 'intval', + 'desc' => $this->l('Enable the ajax search for your visitors.').'
'. + $this->l('With the ajax search, the first 10 products matching the user query will appear in real time below the input field.')), + 'PS_INSTANT_SEARCH' => array( + 'title' => $this->l('Instant search:'), + 'validation' => 'isBool', + 'cast' => 'intval', + 'type' => 'bool', + 'desc' => $this->l('Enable the instant search for your visitors.').'
'. + $this->l('With the instant search, the results will appear immediatly while the user write his query.')), + 'PS_SEARCH_MINWORDLEN' => array( + 'title' => $this->l('Minimum word length'), + 'desc' => $this->l('Only words from this size will be indexed.'), + 'size' => 4, + 'validation' => 'isUnsignedInt', + 'type' => 'text', + 'cast' => 'intval' + ), + 'PS_SEARCH_BLACKLIST' => array( + 'title' => $this->l('Blacklisted words'), + 'size' => 35, + 'validation' => 'isGenericName', + 'desc' => $this->l('Please enter the words separated by a "|".'), + 'type' => 'textLang' + ) ), 'submit' => array() ), 'relevance' => array( - 'title' => $this->l('Relevance'), - 'icon' => 'search', + 'title' => $this->l('Weight'), + 'icon' => 'weight', 'info' => $this->l('The "weight" represents its importance and relevance for the ranking of the products when try a new search.').'
'.$this->l('A word with a weight of 8 will have 4 times more value than a word with a weight of 2.').'

- '.$this->l('That\'s why we advize to set a greater weight for words which appear in the name or reference of a products than the ones of the description of category name. Thus, the search results will be as precised and releant as possible.') - ), - 'weight' => array( - 'title' => $this->l('Weight'), - 'icon' => 'weight', - 'class' => 'width2', + '.$this->l('That\'s why we advize to set a greater weight for words which appear in the name or reference of a products + than the ones of the description of category name. Thus, the search results will be as precised and releant as possible.'), 'fields' => array( - 'PS_SEARCH_WEIGHT_PNAME' => array('title' => $this->l('Product name weight'), 'size' => 4, 'validation' => 'isUnsignedInt', 'type' => 'text', 'cast' => 'intval'), - 'PS_SEARCH_WEIGHT_REF' => array('title' => $this->l('Reference weight'), 'size' => 4, 'validation' => 'isUnsignedInt', 'type' => 'text', 'cast' => 'intval'), - 'PS_SEARCH_WEIGHT_SHORTDESC' => array('title' => $this->l('Short description weight'), 'size' => 4, 'validation' => 'isUnsignedInt', 'type' => 'text', 'cast' => 'intval'), - 'PS_SEARCH_WEIGHT_DESC' => array('title' => $this->l('Description weight'), 'size' => 4, 'validation' => 'isUnsignedInt', 'type' => 'text', 'cast' => 'intval'), - 'PS_SEARCH_WEIGHT_CNAME' => array('title' => $this->l('Category weight'), 'size' => 4, 'validation' => 'isUnsignedInt', 'type' => 'text', 'cast' => 'intval'), - 'PS_SEARCH_WEIGHT_MNAME' => array('title' => $this->l('Manufacturer weight'), 'size' => 4, 'validation' => 'isUnsignedInt', 'type' => 'text', 'cast' => 'intval'), - 'PS_SEARCH_WEIGHT_TAG' => array('title' => $this->l('Tags weight'), 'size' => 4, 'validation' => 'isUnsignedInt', 'type' => 'text', 'cast' => 'intval'), - 'PS_SEARCH_WEIGHT_ATTRIBUTE' => array('title' => $this->l('Attributes weight'), 'size' => 4, 'validation' => 'isUnsignedInt', 'type' => 'text', 'cast' => 'intval'), - 'PS_SEARCH_WEIGHT_FEATURE' => array('title' => $this->l('Features weight'), 'size' => 4, 'validation' => 'isUnsignedInt', 'type' => 'text', 'cast' => 'intval') - ), - 'submit' => array() + 'PS_SEARCH_WEIGHT_PNAME' => array( + 'title' => $this->l('Product name weight'), + 'size' => 4, + 'validation' => 'isUnsignedInt', + 'type' => 'text', + 'cast' => 'intval' + ), + 'PS_SEARCH_WEIGHT_REF' => array( + 'title' => $this->l('Reference weight'), + 'size' => 4, + 'validation' => 'isUnsignedInt', + 'type' => 'text', + 'cast' => 'intval' + ), + 'PS_SEARCH_WEIGHT_SHORTDESC' => array( + 'title' => $this->l('Short description weight'), + 'size' => 4, + 'validation' => 'isUnsignedInt', + 'type' => 'text', + 'cast' => 'intval' + ), + 'PS_SEARCH_WEIGHT_DESC' => array( + 'title' => $this->l('Description weight'), + 'size' => 4, + 'validation' => 'isUnsignedInt', + 'type' => 'text', + 'cast' => 'intval' + ), + 'PS_SEARCH_WEIGHT_CNAME' => array( + 'title' => $this->l('Category weight'), + 'size' => 4, + 'validation' => 'isUnsignedInt', + 'type' => 'text', + 'cast' => 'intval' + ), + 'PS_SEARCH_WEIGHT_MNAME' => array( + 'title' => $this->l('Manufacturer weight'), + 'size' => 4, + 'validation' => 'isUnsignedInt', + 'type' => 'text', + 'cast' => 'intval' + ), + 'PS_SEARCH_WEIGHT_TAG' => array( + 'title' => $this->l('Tags weight'), + 'size' => 4, + 'validation' => 'isUnsignedInt', + 'type' => 'text', + 'cast' => 'intval' + ), + 'PS_SEARCH_WEIGHT_ATTRIBUTE' => array( + 'title' => $this->l('Attributes weight'), + 'size' => 4, + 'validation' => 'isUnsignedInt', + 'type' => 'text', + 'cast' => 'intval' + ), + 'PS_SEARCH_WEIGHT_FEATURE' => array( + 'title' => $this->l('Features weight'), + 'size' => 4, + 'validation' => 'isUnsignedInt', + 'type' => 'text', + 'cast' => 'intval' + ) + ) ), ); }