Version Notes
Changes since last release:
* Additional cron settings
* Extension state disabled by default
* https compatibility for admin UI
* Automatic clearing of old .lock files
* Changes to default attributes
Download this release
Release Info
| Developer | Platform support |
| Extension | slisearch |
| Version | 2.1.2 |
| Comparing to | |
| See all releases | |
Code changes from version 2.1.0 to 2.1.2
- app/code/local/SLI/Search/Block/System/Config/Frontend/Feed/Generate/Js.php +1 -1
- app/code/local/SLI/Search/Helper/Data.php +45 -3
- app/code/local/SLI/Search/Helper/Feed.php +10 -1
- app/code/local/SLI/Search/Model/System/Config/Source/Attributes.php +4 -3
- app/code/local/SLI/Search/Model/System/Config/Source/Cron/Frequency.php +64 -0
- app/code/local/SLI/Search/dropdown.sql +0 -59
- app/code/local/SLI/Search/etc/config.xml +5 -5
- app/code/local/SLI/Search/etc/system.xml +4 -2
- app/design/frontend/base/default/template/sli/search/form.mini.phtml +10 -14
- package.xml +9 -8
app/code/local/SLI/Search/Block/System/Config/Frontend/Feed/Generate/Js.php
CHANGED
|
@@ -35,7 +35,7 @@ class SLI_Search_Block_System_Config_Frontend_Feed_Generate_Js extends Mage_Admi
|
|
| 35 |
public function getGenerateUrl() {
|
| 36 |
$curStore = Mage::app()->getStore();
|
| 37 |
Mage::app()->setCurrentStore(1); //default store number...always 1
|
| 38 |
-
$myUrl = Mage::getUrl('sli_search/search/runFeedGeneration');
|
| 39 |
Mage::app()->setCurrentStore($curStore);
|
| 40 |
return $myUrl;
|
| 41 |
}
|
| 35 |
public function getGenerateUrl() {
|
| 36 |
$curStore = Mage::app()->getStore();
|
| 37 |
Mage::app()->setCurrentStore(1); //default store number...always 1
|
| 38 |
+
$myUrl = Mage::getUrl('sli_search/search/runFeedGeneration', array('_secure' => Mage::app()->getStore()->isCurrentlySecure()));
|
| 39 |
Mage::app()->setCurrentStore($curStore);
|
| 40 |
return $myUrl;
|
| 41 |
}
|
app/code/local/SLI/Search/Helper/Data.php
CHANGED
|
@@ -255,7 +255,13 @@ class SLI_Search_Helper_Data extends Mage_Core_Helper_Abstract {
|
|
| 255 |
*/
|
| 256 |
public function getCronTimeAsCrontab($frequency, $time) {
|
| 257 |
list($hours, $minutes, $seconds) = $time;
|
| 258 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 259 |
$cron = array("*", "*", "*", "*", "*");
|
| 260 |
|
| 261 |
//Parse through time
|
|
@@ -269,6 +275,18 @@ class SLI_Search_Helper_Data extends Mage_Core_Helper_Abstract {
|
|
| 269 |
|
| 270 |
//Parse through frequencies
|
| 271 |
switch ($frequency) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 272 |
case "W":
|
| 273 |
$cron[4] = 0;
|
| 274 |
break;
|
|
@@ -291,22 +309,46 @@ class SLI_Search_Helper_Data extends Mage_Core_Helper_Abstract {
|
|
| 291 |
list($hours, $minutes, $seconds) = explode(',', $this->getCronTime());
|
| 292 |
|
| 293 |
$time = Mage::app()->getLocale()->date();
|
| 294 |
-
$time->setHour(
|
| 295 |
|
| 296 |
//Parse through frequencies
|
| 297 |
switch ($frequency) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 298 |
case "D":
|
|
|
|
| 299 |
if ($time->compare($now) == -1) {
|
| 300 |
$time->addDay(1);
|
| 301 |
}
|
| 302 |
break;
|
| 303 |
case "W":
|
|
|
|
| 304 |
$time->setWeekday(7);
|
| 305 |
if ($time->compare($now) == -1) {
|
| 306 |
$time->addWeek(1);
|
| 307 |
}
|
| 308 |
break;
|
| 309 |
case "M":
|
|
|
|
| 310 |
$time->setDay(1);
|
| 311 |
if ($time->compare($now) == -1) {
|
| 312 |
$time->addMonth(1);
|
|
@@ -365,7 +407,7 @@ class SLI_Search_Helper_Data extends Mage_Core_Helper_Abstract {
|
|
| 365 |
$cartInfoArray['TotalPrice'] = $totals['grand_total']->getValue();
|
| 366 |
|
| 367 |
if( $totals['tax'] )
|
| 368 |
-
|
| 369 |
}
|
| 370 |
|
| 371 |
//Get The Cart Total Discount Amount
|
| 255 |
*/
|
| 256 |
public function getCronTimeAsCrontab($frequency, $time) {
|
| 257 |
list($hours, $minutes, $seconds) = $time;
|
| 258 |
+
/**
|
| 259 |
+
* [0] = minutes
|
| 260 |
+
* [1] = hours
|
| 261 |
+
* [2] = day of month
|
| 262 |
+
* [3] = month
|
| 263 |
+
* [4] = day of week
|
| 264 |
+
*/
|
| 265 |
$cron = array("*", "*", "*", "*", "*");
|
| 266 |
|
| 267 |
//Parse through time
|
| 275 |
|
| 276 |
//Parse through frequencies
|
| 277 |
switch ($frequency) {
|
| 278 |
+
case "3H":
|
| 279 |
+
$cron[1] = '*/3';
|
| 280 |
+
$cron[0] = '00';
|
| 281 |
+
break;
|
| 282 |
+
case "6H":
|
| 283 |
+
$cron[1] = '*/6';
|
| 284 |
+
$cron[0] = '00';
|
| 285 |
+
break;
|
| 286 |
+
case "12H":
|
| 287 |
+
$cron[1] = '*/12';
|
| 288 |
+
$cron[0] = '00';
|
| 289 |
+
break;
|
| 290 |
case "W":
|
| 291 |
$cron[4] = 0;
|
| 292 |
break;
|
| 309 |
list($hours, $minutes, $seconds) = explode(',', $this->getCronTime());
|
| 310 |
|
| 311 |
$time = Mage::app()->getLocale()->date();
|
| 312 |
+
$time->setHour(0)->setMinute(0)->setSecond(0);
|
| 313 |
|
| 314 |
//Parse through frequencies
|
| 315 |
switch ($frequency) {
|
| 316 |
+
case "3H":
|
| 317 |
+
if ($time->compare($now) == -1) {
|
| 318 |
+
while($time->isEarlier($now)){
|
| 319 |
+
$time->addHour(3);
|
| 320 |
+
}
|
| 321 |
+
}
|
| 322 |
+
break;
|
| 323 |
+
case "6H":
|
| 324 |
+
if ($time->compare($now) == -1) {
|
| 325 |
+
while($time->isEarlier($now)){
|
| 326 |
+
$time->addHour(6);
|
| 327 |
+
}
|
| 328 |
+
}
|
| 329 |
+
break;
|
| 330 |
+
case "12H":
|
| 331 |
+
if ($time->compare($now) == -1) {
|
| 332 |
+
while($time->isEarlier($now)){
|
| 333 |
+
$time->addHour(12);
|
| 334 |
+
}
|
| 335 |
+
}
|
| 336 |
+
break;
|
| 337 |
case "D":
|
| 338 |
+
$time->setHour($hours)->setMinute($minutes)->setSecond($seconds);
|
| 339 |
if ($time->compare($now) == -1) {
|
| 340 |
$time->addDay(1);
|
| 341 |
}
|
| 342 |
break;
|
| 343 |
case "W":
|
| 344 |
+
$time->setHour($hours)->setMinute($minutes)->setSecond($seconds);
|
| 345 |
$time->setWeekday(7);
|
| 346 |
if ($time->compare($now) == -1) {
|
| 347 |
$time->addWeek(1);
|
| 348 |
}
|
| 349 |
break;
|
| 350 |
case "M":
|
| 351 |
+
$time->setHour($hours)->setMinute($minutes)->setSecond($seconds);
|
| 352 |
$time->setDay(1);
|
| 353 |
if ($time->compare($now) == -1) {
|
| 354 |
$time->addMonth(1);
|
| 407 |
$cartInfoArray['TotalPrice'] = $totals['grand_total']->getValue();
|
| 408 |
|
| 409 |
if( $totals['tax'] )
|
| 410 |
+
$cartInfoArray['TotalTax'] = $totals['tax']->getValue();
|
| 411 |
}
|
| 412 |
|
| 413 |
//Get The Cart Total Discount Amount
|
app/code/local/SLI/Search/Helper/Feed.php
CHANGED
|
@@ -137,7 +137,16 @@ class SLI_Search_Helper_Feed {
|
|
| 137 |
foreach (scandir($path) as $file) {
|
| 138 |
$fullFile = $path.DS.$file;
|
| 139 |
if (is_file($fullFile) && !is_dir($fullFile) && is_numeric(strpos($file, '.lock'))) {
|
| 140 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 141 |
}
|
| 142 |
}
|
| 143 |
return false;
|
| 137 |
foreach (scandir($path) as $file) {
|
| 138 |
$fullFile = $path.DS.$file;
|
| 139 |
if (is_file($fullFile) && !is_dir($fullFile) && is_numeric(strpos($file, '.lock'))) {
|
| 140 |
+
$modification_time = filemtime($fullFile);
|
| 141 |
+
if(!$modification_time) {
|
| 142 |
+
return true;
|
| 143 |
+
}else {
|
| 144 |
+
if ((time() - filemtime($fullFile)) > (24 * 60 * 60)) { // Check if older than 1 day
|
| 145 |
+
unlink($fullFile); // Lock file older than a day so remove it
|
| 146 |
+
return false;
|
| 147 |
+
}
|
| 148 |
+
return true;
|
| 149 |
+
}
|
| 150 |
}
|
| 151 |
}
|
| 152 |
return false;
|
app/code/local/SLI/Search/Model/System/Config/Source/Attributes.php
CHANGED
|
@@ -21,10 +21,11 @@ class SLI_Search_Model_System_Config_Source_Attributes {
|
|
| 21 |
|
| 22 |
//These attributes are automatically included in the feed and thus dont need
|
| 23 |
//to be selectable on the configuration
|
| 24 |
-
protected $_automaticAttributes = array('name', 'url_path', 'status', 'type_id');
|
| 25 |
|
| 26 |
-
//Remove attributes that do not need to be included in the feed
|
| 27 |
-
|
|
|
|
| 28 |
|
| 29 |
/**
|
| 30 |
* We want these attributes to appear in the drop down configuration menu, but they are not included in the
|
| 21 |
|
| 22 |
//These attributes are automatically included in the feed and thus dont need
|
| 23 |
//to be selectable on the configuration
|
| 24 |
+
protected $_automaticAttributes = array('name', 'url_path', 'status', 'type_id','product_id');
|
| 25 |
|
| 26 |
+
//Remove attributes that do not need to be included in the feed or cause issues
|
| 27 |
+
//in feed generation when selected.
|
| 28 |
+
protected $_blockedAttributes = array('category_id','category_ids');
|
| 29 |
|
| 30 |
/**
|
| 31 |
* We want these attributes to appear in the drop down configuration menu, but they are not included in the
|
app/code/local/SLI/Search/Model/System/Config/Source/Cron/Frequency.php
ADDED
|
@@ -0,0 +1,64 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Copyright (c) 2013 S.L.I. Systems, Inc. (www.sli-systems.com) - All Rights Reserved
|
| 4 |
+
* This file is part of Learning Search Connect.
|
| 5 |
+
* Learning Search Connect is distribute under license,
|
| 6 |
+
* go to www.sli-systems.com/LSC for full license details.
|
| 7 |
+
*
|
| 8 |
+
* THIS CODE AND INFORMATION ARE PROVIDED "AS IS" WITHOUT WARRANTY OF ANY
|
| 9 |
+
* KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
|
| 10 |
+
* IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
|
| 11 |
+
* PARTICULAR PURPOSE.
|
| 12 |
+
*
|
| 13 |
+
* Cron Frequency Model
|
| 14 |
+
*
|
| 15 |
+
* @package SLI
|
| 16 |
+
* @subpackage Search
|
| 17 |
+
*/
|
| 18 |
+
|
| 19 |
+
class SLI_Search_Model_System_Config_Source_Cron_Frequency {
|
| 20 |
+
|
| 21 |
+
protected static $_options;
|
| 22 |
+
|
| 23 |
+
const CRON_3_HOURLY = '3H';
|
| 24 |
+
const CRON_6_HOURLY = '6H';
|
| 25 |
+
const CRON_12_HOURLY = '12H';
|
| 26 |
+
const CRON_DAILY = 'D';
|
| 27 |
+
const CRON_WEEKLY = 'W';
|
| 28 |
+
const CRON_MONTHLY = 'M';
|
| 29 |
+
|
| 30 |
+
public function toOptionArray()
|
| 31 |
+
{
|
| 32 |
+
if (!self::$_options) {
|
| 33 |
+
self::$_options = array(
|
| 34 |
+
array(
|
| 35 |
+
'label' => Mage::helper('cron')->__('3 Hourly'),
|
| 36 |
+
'value' => self::CRON_3_HOURLY,
|
| 37 |
+
),
|
| 38 |
+
array(
|
| 39 |
+
'label' => Mage::helper('cron')->__('6 Hourly'),
|
| 40 |
+
'value' => self::CRON_6_HOURLY,
|
| 41 |
+
),
|
| 42 |
+
array(
|
| 43 |
+
'label' => Mage::helper('cron')->__('12 Hourly'),
|
| 44 |
+
'value' => self::CRON_12_HOURLY,
|
| 45 |
+
),
|
| 46 |
+
array(
|
| 47 |
+
'label' => Mage::helper('cron')->__('Daily'),
|
| 48 |
+
'value' => self::CRON_DAILY,
|
| 49 |
+
),
|
| 50 |
+
array(
|
| 51 |
+
'label' => Mage::helper('cron')->__('Weekly'),
|
| 52 |
+
'value' => self::CRON_WEEKLY,
|
| 53 |
+
),
|
| 54 |
+
array(
|
| 55 |
+
'label' => Mage::helper('cron')->__('Monthly'),
|
| 56 |
+
'value' => self::CRON_MONTHLY,
|
| 57 |
+
),
|
| 58 |
+
|
| 59 |
+
);
|
| 60 |
+
}
|
| 61 |
+
return self::$_options;
|
| 62 |
+
}
|
| 63 |
+
}
|
| 64 |
+
|
app/code/local/SLI/Search/dropdown.sql
DELETED
|
@@ -1,59 +0,0 @@
|
|
| 1 |
-
SELECT `e`.`entity_id`
|
| 2 |
-
AS
|
| 3 |
-
`product_id`,
|
| 4 |
-
IF(at_name.value_id > 0, at_name.value, at_name_default.value)
|
| 5 |
-
AS `name`,
|
| 6 |
-
IF(at_url_path.value_id > 0, at_url_path.value,
|
| 7 |
-
at_url_path_default.value) AS
|
| 8 |
-
`url_path`,
|
| 9 |
-
IF(at_somethingspecial.value_id > 0, at_somethingspecial.value,
|
| 10 |
-
at_somethingspecial_default.value)
|
| 11 |
-
AS `somethingspecial`,
|
| 12 |
-
Group_concat(DISTINCT opt_somethingspecial.value SEPARATOR '|')
|
| 13 |
-
AS
|
| 14 |
-
`option_somethingspecial`
|
| 15 |
-
FROM `catalog_product_entity` AS `e`
|
| 16 |
-
INNER JOIN `catalog_product_entity_int` AS `at_status_default`
|
| 17 |
-
ON ( `at_status_default`.`entity_id` = `e`.`entity_id` )
|
| 18 |
-
AND ( `at_status_default`.`attribute_id` = '273' )
|
| 19 |
-
AND `at_status_default`.`store_id` = 0
|
| 20 |
-
LEFT JOIN `catalog_product_entity_int` AS `at_status`
|
| 21 |
-
ON ( `at_status`.`entity_id` = `e`.`entity_id` )
|
| 22 |
-
AND ( `at_status`.`attribute_id` = '273' )
|
| 23 |
-
AND ( `at_status`.`store_id` = 2 )
|
| 24 |
-
INNER JOIN `catalog_product_website` AS `product_website`
|
| 25 |
-
ON product_website.product_id = e.entity_id
|
| 26 |
-
AND product_website.website_id = '1'
|
| 27 |
-
LEFT JOIN `catalog_product_entity_varchar` AS `at_name_default`
|
| 28 |
-
ON ( `at_name_default`.`entity_id` = `e`.`entity_id` )
|
| 29 |
-
AND ( `at_name_default`.`attribute_id` = '96' )
|
| 30 |
-
AND `at_name_default`.`store_id` = 0
|
| 31 |
-
LEFT JOIN `catalog_product_entity_varchar` AS `at_name`
|
| 32 |
-
ON ( `at_name`.`entity_id` = `e`.`entity_id` )
|
| 33 |
-
AND ( `at_name`.`attribute_id` = '96' )
|
| 34 |
-
AND ( `at_name`.`store_id` = '2 OR `at_name`.`store_id` = 1' )
|
| 35 |
-
LEFT JOIN `catalog_product_entity_varchar` AS `at_url_path_default`
|
| 36 |
-
ON ( `at_url_path_default`.`entity_id` = `e`.`entity_id` )
|
| 37 |
-
AND ( `at_url_path_default`.`attribute_id` = '570' )
|
| 38 |
-
AND `at_url_path_default`.`store_id` = 0
|
| 39 |
-
LEFT JOIN `catalog_product_entity_varchar` AS `at_url_path`
|
| 40 |
-
ON ( `at_url_path`.`entity_id` = `e`.`entity_id` )
|
| 41 |
-
AND ( `at_url_path`.`attribute_id` = '570' )
|
| 42 |
-
AND ( `at_url_path`.`store_id` =
|
| 43 |
-
'2 OR `at_url_path`.`store_id` = 1' )
|
| 44 |
-
LEFT JOIN `catalog_product_entity_int` AS `at_somethingspecial_default`
|
| 45 |
-
ON ( `at_somethingspecial_default`.`entity_id` = `e`.`entity_id` )
|
| 46 |
-
AND ( `at_somethingspecial_default`.`attribute_id` = '1004' )
|
| 47 |
-
AND `at_somethingspecial_default`.`store_id` = 0
|
| 48 |
-
LEFT JOIN `catalog_product_entity_int` AS `at_somethingspecial`
|
| 49 |
-
ON ( `at_somethingspecial`.`entity_id` = `e`.`entity_id` )
|
| 50 |
-
AND ( `at_somethingspecial`.`attribute_id` = '1004' )
|
| 51 |
-
AND ( `at_somethingspecial`.`store_id` =
|
| 52 |
-
'1 OR `at_somethingspecial`.`store_id` = 1'
|
| 53 |
-
)
|
| 54 |
-
LEFT JOIN `eav_attribute_option_value` AS `opt_somethingspecial`
|
| 55 |
-
ON Concat(',', at_somethingspecial.value, ',') LIKE
|
| 56 |
-
Concat('%,', opt_somethingspecial.option_id, ',%')
|
| 57 |
-
WHERE ( IF(at_status.value_id > 0, at_status.value, at_status_default.value) =
|
| 58 |
-
'1' )
|
| 59 |
-
GROUP BY e.entity_id having e.entity_id = 168;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/code/local/SLI/Search/etc/config.xml
CHANGED
|
@@ -20,7 +20,7 @@
|
|
| 20 |
<config>
|
| 21 |
<modules>
|
| 22 |
<SLI_Search>
|
| 23 |
-
<version>2.1.
|
| 24 |
</SLI_Search>
|
| 25 |
</modules>
|
| 26 |
<global>
|
|
@@ -73,7 +73,7 @@
|
|
| 73 |
<default>
|
| 74 |
<sli_search>
|
| 75 |
<general>
|
| 76 |
-
<enabled>
|
| 77 |
<log_level>1</log_level>
|
| 78 |
<price_feed>0</price_feed>
|
| 79 |
</general>
|
|
@@ -99,7 +99,7 @@
|
|
| 99 |
</js>
|
| 100 |
<cron>
|
| 101 |
<email></email>
|
| 102 |
-
<frequency backend_model="
|
| 103 |
<time>2,00,00</time>
|
| 104 |
<disabled>0</disabled>
|
| 105 |
</cron>
|
|
@@ -107,8 +107,8 @@
|
|
| 107 |
<attributes backend_model="sli_search/system_config_backend_minigrid" />
|
| 108 |
</attributes>
|
| 109 |
<default_attributes>
|
| 110 |
-
<attributes>name,url_path<!--sku,short_description,description,meta_description,price,special_price,special_from_date,special_to_date,news_to_date,news_from_date,image,small_image,product_id,type_id--></attributes>
|
| 111 |
-
</default_attributes>
|
| 112 |
</sli_search>
|
| 113 |
</default>
|
| 114 |
<crontab>
|
| 20 |
<config>
|
| 21 |
<modules>
|
| 22 |
<SLI_Search>
|
| 23 |
+
<version>2.1.2</version>
|
| 24 |
</SLI_Search>
|
| 25 |
</modules>
|
| 26 |
<global>
|
| 73 |
<default>
|
| 74 |
<sli_search>
|
| 75 |
<general>
|
| 76 |
+
<enabled>2</enabled>
|
| 77 |
<log_level>1</log_level>
|
| 78 |
<price_feed>0</price_feed>
|
| 79 |
</general>
|
| 99 |
</js>
|
| 100 |
<cron>
|
| 101 |
<email></email>
|
| 102 |
+
<frequency backend_model="sli_search/system_config_backend_cron">D</frequency>
|
| 103 |
<time>2,00,00</time>
|
| 104 |
<disabled>0</disabled>
|
| 105 |
</cron>
|
| 107 |
<attributes backend_model="sli_search/system_config_backend_minigrid" />
|
| 108 |
</attributes>
|
| 109 |
<default_attributes>
|
| 110 |
+
<attributes>name,url_path,product_id<!--sku,short_description,description,meta_description,price,special_price,special_from_date,special_to_date,news_to_date,news_from_date,image,small_image,product_id,type_id--></attributes>
|
| 111 |
+
</default_attributes>
|
| 112 |
</sli_search>
|
| 113 |
</default>
|
| 114 |
<crontab>
|
app/code/local/SLI/Search/etc/system.xml
CHANGED
|
@@ -268,8 +268,9 @@
|
|
| 268 |
</email>
|
| 269 |
<frequency translate="label">
|
| 270 |
<label>Frequency</label>
|
|
|
|
| 271 |
<frontend_type>select</frontend_type>
|
| 272 |
-
<source_model>
|
| 273 |
<backend_model>sli_search/system_config_backend_cron</backend_model>
|
| 274 |
<sort_order>100</sort_order>
|
| 275 |
<show_in_default>1</show_in_default>
|
|
@@ -278,6 +279,7 @@
|
|
| 278 |
</frequency>
|
| 279 |
<time translate="label">
|
| 280 |
<label>Start Time</label>
|
|
|
|
| 281 |
<frontend_type>time</frontend_type>
|
| 282 |
<sort_order>200</sort_order>
|
| 283 |
<show_in_default>1</show_in_default>
|
|
@@ -305,7 +307,7 @@
|
|
| 305 |
<fields>
|
| 306 |
<attributes translate="label">
|
| 307 |
<label>Attributes to include</label>
|
| 308 |
-
<comment>The following attributes are automatically added to the feed: Name, URL, Children Ids, and
|
| 309 |
<frontend_type>minigrid</frontend_type>
|
| 310 |
<source_model>sli_search/system_config_source_minigrid_attributes</source_model>
|
| 311 |
<backend_model>sli_search/system_config_backend_minigrid</backend_model>
|
| 268 |
</email>
|
| 269 |
<frequency translate="label">
|
| 270 |
<label>Frequency</label>
|
| 271 |
+
<comment>Hourly times from 12:00AM</comment>
|
| 272 |
<frontend_type>select</frontend_type>
|
| 273 |
+
<source_model>sli_search/system_config_source_cron_frequency</source_model>
|
| 274 |
<backend_model>sli_search/system_config_backend_cron</backend_model>
|
| 275 |
<sort_order>100</sort_order>
|
| 276 |
<show_in_default>1</show_in_default>
|
| 279 |
</frequency>
|
| 280 |
<time translate="label">
|
| 281 |
<label>Start Time</label>
|
| 282 |
+
<comment>Only used when set to Daily, Weekly or Monthly</comment>
|
| 283 |
<frontend_type>time</frontend_type>
|
| 284 |
<sort_order>200</sort_order>
|
| 285 |
<show_in_default>1</show_in_default>
|
| 307 |
<fields>
|
| 308 |
<attributes translate="label">
|
| 309 |
<label>Attributes to include</label>
|
| 310 |
+
<comment>The following attributes are automatically added to the feed: Name, URL, Children Ids, Categories and Product Ids.</comment>
|
| 311 |
<frontend_type>minigrid</frontend_type>
|
| 312 |
<source_model>sli_search/system_config_source_minigrid_attributes</source_model>
|
| 313 |
<backend_model>sli_search/system_config_backend_minigrid</backend_model>
|
app/design/frontend/base/default/template/sli/search/form.mini.phtml
CHANGED
|
@@ -20,10 +20,8 @@
|
|
| 20 |
?>
|
| 21 |
<form name="searchform" action="<?php echo $this->getSearchUrl() ?>" method="get" id="SliSearchProductForm" onsubmit="ajaxsearchsubmit(this);return false;">
|
| 22 |
<div class="form-search">
|
| 23 |
-
<label for="
|
| 24 |
-
<input type="
|
| 25 |
-
<input type="hidden" name="asug" />
|
| 26 |
-
<input type="text" name="w" id="sli_search_1" class="input-text" autocomplete="off" size="20"/>
|
| 27 |
<button type="submit" title="<?php echo $this->__('Search') ?>" class="button"><span><span><?php echo $this->__('Search') ?></span></span></button>
|
| 28 |
</div>
|
| 29 |
<script type="text/javascript">
|
|
@@ -34,17 +32,15 @@
|
|
| 34 |
</form>
|
| 35 |
<?php echo $this->getInlineAutocompleteJs(); ?>
|
| 36 |
<script type="text/javascript">
|
| 37 |
-
function ajaxsearchsubmit(form){
|
| 38 |
-
|
| 39 |
-
|
| 40 |
window.location=slibaseurlsearch+"#w="+search
|
| 41 |
-
|
| 42 |
-
|
| 43 |
-
|
| 44 |
-
|
| 45 |
-
|
| 46 |
-
return false;
|
| 47 |
-
}
|
| 48 |
</script>
|
| 49 |
|
| 50 |
|
| 20 |
?>
|
| 21 |
<form name="searchform" action="<?php echo $this->getSearchUrl() ?>" method="get" id="SliSearchProductForm" onsubmit="ajaxsearchsubmit(this);return false;">
|
| 22 |
<div class="form-search">
|
| 23 |
+
<label for="sli_search_1">Search:</label>
|
| 24 |
+
<input type="text" name="w" id="sli_search_1" class="input-text" autocomplete="off" />
|
|
|
|
|
|
|
| 25 |
<button type="submit" title="<?php echo $this->__('Search') ?>" class="button"><span><span><?php echo $this->__('Search') ?></span></span></button>
|
| 26 |
</div>
|
| 27 |
<script type="text/javascript">
|
| 32 |
</form>
|
| 33 |
<?php echo $this->getInlineAutocompleteJs(); ?>
|
| 34 |
<script type="text/javascript">
|
| 35 |
+
function ajaxsearchsubmit(form){
|
| 36 |
+
var search = encodeURIComponent(form.w.value);
|
| 37 |
+
if (typeof ajaxsearch !== 'undefined' && ajaxsearch) {
|
| 38 |
window.location=slibaseurlsearch+"#w="+search
|
| 39 |
+
} else {
|
| 40 |
+
window.location=slibaseurlsearch+"?w="+search;
|
| 41 |
+
}
|
| 42 |
+
return false;
|
| 43 |
+
}
|
|
|
|
|
|
|
| 44 |
</script>
|
| 45 |
|
| 46 |
|
package.xml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>slisearch</name>
|
| 4 |
-
<version>2.1.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://sli-systems.com/lsc">SLI Feed Generation</license>
|
| 7 |
<channel>community</channel>
|
|
@@ -9,14 +9,15 @@
|
|
| 9 |
<summary>LSC integrates Magento with SLI's SaaS based Learning Search, Learning Navigation and user based SEO products.</summary>
|
| 10 |
<description>Learning Search Connect (LSC) produces data feeds out of current Magento Community and Enterprise editions. The feeds are created and then sent to SLI's FTP servers for further processing.</description>
|
| 11 |
<notes>Changes since last release:
|
| 12 |
-
*
|
| 13 |
-
*
|
| 14 |
-
*
|
| 15 |
-
*
|
|
|
|
| 16 |
<authors><author><name>Platform support</name><user>SLI-Systems</user><email>support@sli-system.com</email></author></authors>
|
| 17 |
-
<date>2014-
|
| 18 |
-
<time>
|
| 19 |
-
<contents><target name="magelocal"><dir name="SLI"><dir name="CartInfo"><dir name="Helper"><file name="Data.php" hash="e21fab6e74d644a9f2509fab1f9f099b"/></dir><dir name="controllers"><file name="ApiController.php" hash="829a8a8cb1252a03f3037d0a34c1bbc7"/></dir><dir name="etc"><file name="config.xml" hash="a99af741f52449605d7bb2150a8730e6"/></dir></dir><dir name="Search"><dir name="Block"><dir name="Search"><dir name="Form"><file name="Mini.php" hash="7abb2d4708fae5018a214c3c04c626bf"/></dir><dir name="Js"><file name="Bottom.php" hash="c6477910e2814c18b36d58886a588d6c"/><file name="Top.php" hash="30c9de8f8a7059af5fa7eb381ee0f368"/></dir></dir><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><dir name="Minigrid"><file name="Js.php" hash="1a9a5a3c880c11f6e99ba53956ec7101"/></dir><file name="Minigrid.php" hash="3f0810444f875bf8502ef79742a314e4"/><file name="Version.php" hash="72bcde22f1eaa0e2f8fafd3e00d717e4"/></dir></dir><file name="Form.php" hash="4a1551d259ef3510cb803cb02a026083"/><dir name="Frontend"><dir name="Feed"><dir name="Generate"><file name="Js.php" hash="
|
| 20 |
<compatible/>
|
| 21 |
<dependencies><required><php><min>5.3.19</min><max>5.5.0</max></php></required></dependencies>
|
| 22 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>slisearch</name>
|
| 4 |
+
<version>2.1.2</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://sli-systems.com/lsc">SLI Feed Generation</license>
|
| 7 |
<channel>community</channel>
|
| 9 |
<summary>LSC integrates Magento with SLI's SaaS based Learning Search, Learning Navigation and user based SEO products.</summary>
|
| 10 |
<description>Learning Search Connect (LSC) produces data feeds out of current Magento Community and Enterprise editions. The feeds are created and then sent to SLI's FTP servers for further processing.</description>
|
| 11 |
<notes>Changes since last release:
|
| 12 |
+
* Additional cron settings
|
| 13 |
+
* Extension state disabled by default
|
| 14 |
+
* https compatibility for admin UI
|
| 15 |
+
* Automatic clearing of old .lock files
|
| 16 |
+
* Changes to default attributes</notes>
|
| 17 |
<authors><author><name>Platform support</name><user>SLI-Systems</user><email>support@sli-system.com</email></author></authors>
|
| 18 |
+
<date>2014-10-31</date>
|
| 19 |
+
<time>03:22:19</time>
|
| 20 |
+
<contents><target name="magelocal"><dir name="SLI"><dir name="CartInfo"><dir name="Helper"><file name="Data.php" hash="e21fab6e74d644a9f2509fab1f9f099b"/></dir><dir name="controllers"><file name="ApiController.php" hash="829a8a8cb1252a03f3037d0a34c1bbc7"/></dir><dir name="etc"><file name="config.xml" hash="a99af741f52449605d7bb2150a8730e6"/></dir></dir><dir name="Search"><dir name="Block"><dir name="Search"><dir name="Form"><file name="Mini.php" hash="7abb2d4708fae5018a214c3c04c626bf"/></dir><dir name="Js"><file name="Bottom.php" hash="c6477910e2814c18b36d58886a588d6c"/><file name="Top.php" hash="30c9de8f8a7059af5fa7eb381ee0f368"/></dir></dir><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><dir name="Minigrid"><file name="Js.php" hash="1a9a5a3c880c11f6e99ba53956ec7101"/></dir><file name="Minigrid.php" hash="3f0810444f875bf8502ef79742a314e4"/><file name="Version.php" hash="72bcde22f1eaa0e2f8fafd3e00d717e4"/></dir></dir><file name="Form.php" hash="4a1551d259ef3510cb803cb02a026083"/><dir name="Frontend"><dir name="Feed"><dir name="Generate"><file name="Js.php" hash="c7a4f7c7cbd83c3479d8bf2cfc360597"/></dir><file name="Generate.php" hash="3ad8446e6650c5d3562574f294b4bcef"/><file name="Next.php" hash="008c3d9351c50712ea4d2b76531e0bb4"/></dir></dir></dir></dir><dir name="Widget"><dir name="Minigrid"><file name="Form.php" hash="014ef14b01cbafc9cd305e9a1caf82ae"/></dir></dir></dir><file name="Exception.php" hash="6a8fc0cab1826df68df2e447d2152e58"/><dir name="Helper"><file name="Data.php" hash="c2a9bac7342a0abbb19a3419c8439af2"/><file name="Feed.php" hash="6062039ea1f2570e858a6a247ba68d2b"/></dir><dir name="Model"><file name="Cron.php" hash="8b5add82d7d473205556c29684393849"/><file name="Email.php" hash="701049238dca1a452e67d7bcc0d77f00"/><file name="Feed.php" hash="8d99140347d164e59e3258cd44ddf846"/><dir name="System"><dir name="Config"><dir name="Backend"><file name="Cron.php" hash="ae282d6bfc5e22e7c3320d581465f24d"/><file name="Enabledsetting.php" hash="059ac548a388b8ca02147d0d317f7bb5"/><file name="Loglevel.php" hash="31b58bfdf479b9de2380f3d741bd3175"/><file name="Minigrid.php" hash="a899cfbc25c573846b735e1170970c99"/></dir><dir name="Source"><file name="Attributes.php" hash="e777863deb4e2e17574a833202911f38"/><dir name="Cron"><file name="Frequency.php" hash="882dade19aec9b2bddf1cdb611be018c"/></dir><dir name="Minigrid"><file name="Abstract.php" hash="3f65ae2dd959bb8583cfcffb0109cffa"/><file name="Attributes.php" hash="7a97225139a38a4a0576538293980187"/></dir></dir></dir></dir></dir><dir name="controllers"><file name="ApiController.php" hash="1ad1d4d008f2021642992e6ec058f515"/><file name="SearchController.php" hash="44422b8daf76199590dd0d7cbfb4a76c"/></dir><dir name="doc"><file name="changelog.txt" hash="93ac6e72c6dbfb91e3ee2f2c2701d865"/><file name="design.txt" hash="ff939b286de699aed45c6d6ad103cd5c"/><file name="makeTar.txt" hash="ef75554f12dde147891fea285a7f6bc0"/></dir><dir name="etc"><file name="adminhtml.xml" hash="868b799465f118e2212bcff9048994bb"/><file name="config.xml" hash="2d70defe4261a4f90ac7a03f8962bcea"/><file name="system.xml" hash="fcfe0b7c7decfdea19f0a8c3cb841aee"/></dir><dir name="sql"><dir name="sli_search_setup"><file name="install-1.0.0.php" hash="8b5dd72380e039eb124b804657086f77"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="sli"><dir name="search"><dir name="sysconfig"><dir name="generate"><file name="js.phtml" hash="1c319107ff81a345b1a74e35db7e9345"/></dir></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><dir name="sli"><file name="search.xml" hash="577634295563f34597cbbde6978d56d1"/></dir></dir><dir name="template"><dir name="sli"><dir name="search"><file name="form.mini.phtml" hash="6e8beb25a116b90884dc36696c615dcb"/></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="SLI_Search.xml" hash="69e7e36c854f81f58e6445324aa37021"/></dir></target><target name="mage"><dir name="shell"><dir name="sli"><file name="feed.php" hash="daaf2fdb80f6cc72ddf5b35709822416"/></dir></dir></target></contents>
|
| 21 |
<compatible/>
|
| 22 |
<dependencies><required><php><min>5.3.19</min><max>5.5.0</max></php></required></dependencies>
|
| 23 |
</package>
|
