Skip to content

Commit

Permalink
Bugfix. New package files.
Browse files Browse the repository at this point in the history 
Signed-off-by: Carlos Escribano <carlos@doofinder.com>
  • Loading branch information
@carlosescri
carlosescri committed Nov 4, 2015
1 parent 22bf509 commit 675942a
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 25 deletions.
13 changes: 0 additions & 13 deletions app/code/community/Doofinder/Feed/Model/Generator.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -736,19 +736,6 @@ protected function _getFieldsMap()
return $this->_fieldMap;
}

protected function _cleanFieldValue($field)
{
// http://stackoverflow.com/questions/4224141/php-removing-invalid-utf-8-characters-in-xml-using-filter
$valid_utf8 = '/([\x09\x0A\x0D\x20-\x7E]|[\xC2-\xDF][\x80-\xBF]|\xE0[\xA0-\xBF][\x80-\xBF]|[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}|\xED[\x80-\x9F][\x80-\xBF]|\xF0[\x90-\xBF][\x80-\xBF]{2}|[\xF1-\xF3][\x80-\xBF]{3}|\xF4[\x80-\x8F][\x80-\xBF]{2})|./x';

$field = preg_replace('#<br(\s?/)?>#i', ' ', $field);
$field = strip_tags($field);
$field = preg_replace('/[ ]{2,}/', ' ', $field);
$field = trim($field);

return preg_replace($valid_utf8, '$1', $field);
}

protected function _stopOnException(Exception $e)
{
Mage::logError($e->getMessage());
Expand Down
10 changes: 4 additions & 6 deletions var/connect/Doofinder_Feed.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<_>
<form_key>rwFjwWZ3fJZfqMeG</form_key>
<form_key>3kJmSTs3xoQJFsNK</form_key>
<name>Doofinder_Feed</name>
<channel>community</channel>
<version_ids>
Expand Down Expand Up @@ -49,11 +49,9 @@ You can get more info and create your account visiting the Doofinder site:
http://www.doofinder.com</description>
<license>Open Software License (OSL 3.0)</license>
<license_uri>http://opensource.org/licenses/osl-3.0.php</license_uri>
<version>1.5.9</version>
<version>1.5.10</version>
<stability>stable</stability>
<notes>Fixed categories with HTML in their names.
Added UTF-8 filters to categories.
Fixed issue with JS merge in admin.</notes>
<notes>Remove HTML entities when dumping a field into the data feed.</notes>
<authors>
<name>
<name>Carlos Escribano Rey</name>
Expand Down Expand Up @@ -82,7 +80,7 @@ Fixed issue with JS merge in admin.</notes>
<max/>
</max>
<files>
<files> </files>
<files> </files>
</files>
</package>
<extension>
Expand Down
10 changes: 4 additions & 6 deletions var/connect/package.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package>
<name>Doofinder_Feed</name>
<version>1.5.9</version>
<version>1.5.10</version>
<stability>stable</stability>
<license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL 3.0)</license>
<channel>community</channel>
Expand Down Expand Up @@ -48,13 +48,11 @@ Doofinder is fast and innovative. With no doubt, it is the best search engine fo
You can get more info and create your account visiting the Doofinder site:&#xD;
&#xD;
http://www.doofinder.com</description>
<notes>Fixed categories with HTML in their names.&#xD;
Added UTF-8 filters to categories.&#xD;
Fixed issue with JS merge in admin.</notes>
<notes>Remove HTML entities when dumping a field into the data feed.</notes>
<authors><author><name>Carlos Escribano Rey</name><user>doofinder</user><email>carlos@doofinder.com</email></author></authors>
<date>2015-11-04</date>
<time>09:21:16</time>
<contents><target name="magecommunity"><dir name="Doofinder"><dir name="Feed"><dir name="Block"><dir name="Adminhtml"><dir name="Log"><file name="View.php" hash="a4c92c33f75b38fb3b58a22989a7789f"/></dir><dir name="Map"><file name="Additional.php" hash="f92cf316816687e23f4359ff49f139de"/></dir></dir><file name="Integration.php" hash="5f8249548999b17f62daf2370e28466b"/><dir name="Settings"><dir name="Buttons"><file name="Generate.php" hash="bdb9eb422613f219e919b3d696c34e3d"/><file name="ViewLog.php" hash="c06100281b58e1934314dac0c8a715b7"/></dir><dir name="Panel"><file name="Datetime.php" hash="c3c5dd3f701a8cc5dd858e88af48e14a"/><file name="Description.php" hash="0e52f69f685d4a7d761079ac4e7fdef3"/><file name="File.php" hash="ed013b6c857e20a0d8662ae3ab92a80a"/><file name="Layerdescription.php" hash="ab3be919f18ab3b4ea29588e802faa0a"/><file name="Message.php" hash="0f1ee836d228e67d9886aa8f8371f1fd"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="5b96feff908dab3c25eedefff973c65f"/><file name="Log.php" hash="9de44d77baabac18b2e20b6445beec80"/><file name="Tax.php" hash="28a09225a5692f5f52c1cfe26dce4996"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Backend"><file name="Cron.php" hash="2337232946187cd8d05e0de7eaffa278"/></dir></dir></dir></dir><file name="Config.php" hash="4e5038f086e6f900669e63e246cf1fa4"/><file name="Cron.php" hash="e4a9f1d982b5f8f1b0c247d9a3295d70"/><file name="Generator.php" hash="1528364c78fd89fc31ae24e5d59e6241"/><file name="Log.php" hash="dbfc5029f22a820f7c26f4c7742d6531"/><dir name="Map"><dir name="Product"><file name="Abstract.php" hash="7349688cabdc418d9dff37970b160176"/><file name="Associated.php" hash="7950386743a41aacb10902747d78956e"/><file name="Bundle.php" hash="7be9e63899abbc502dc819d9af00ad68"/><file name="Configurable.php" hash="2d2da31b5e76c123ada113b2f8a08c75"/><file name="Downloadable.php" hash="8c6755814ebcf96deed6cb91e7425f30"/><file name="Grouped.php" hash="91ede45a619b263a9cf363838a6ca630"/><file name="Simple.php" hash="bace15bc059b421832fc6ad9f05ed4cc"/><file name="Virtual.php" hash="92f939b3bb472acb4af5a04a18dc0d42"/></dir></dir><dir name="Mysql4"><dir name="Cron"><file name="Collection.php" hash="e6775b1237ee7ea81f570e52923b1754"/></dir><file name="Cron.php" hash="ee9366ab49b7ade7ca8dc0992e0c3cb7"/><dir name="Log"><file name="Collection.php" hash="9e7533055dafac3362ff597c52ea4fff"/></dir><file name="Log.php" hash="5f7d6fb6352e5c54203340af5256c1cf"/></dir><dir name="Observers"><file name="Feed.php" hash="ce3cd4c68a547f4ded7d7566e9fab91b"/><file name="Logs.php" hash="20dbac95be4e5563ba36d8831b1ddfa9"/><file name="Schedule.php" hash="3e9a156a29543686133bf7049dc68e0c"/></dir><dir name="Resource"><dir name="Mysql4"><file name="Setup.php" hash="18ede20410abe60f3ac9a2316f6f148c"/></dir></dir><dir name="System"><dir name="Config"><dir name="Backend"><dir name="Map"><file name="Additional.php" hash="d461441e95ecc94873b044c6f2d8d06b"/></dir></dir><file name="Reset.php" hash="54b5013a7626b42deb2b5f5481059aae"/><dir name="Source"><dir name="Product"><file name="Attributes.php" hash="fd27124c283ac43d4943f0c7f12df309"/></dir></dir></dir></dir><file name="Tools.php" hash="6910a4c2861118e42489c3861a7f44b1"/></dir><dir name="Test"><dir name="Controller"><dir name="Index"><dir name="fixtures"><file name="testConfig.yaml" hash="0a1f21a3417389e0c0a13392c79a7a89"/><file name="testFeed.yaml" hash="694cf25a35a9a301a8ae678866937909"/><file name="testIndex.yaml" hash="0a1f21a3417389e0c0a13392c79a7a89"/></dir><dir name="providers"><file name="testConfig.yaml" hash="0a1f21a3417389e0c0a13392c79a7a89"/><file name="testFeed.yaml" hash="1ea2f638be8fdcea22ef47767ed8d7db"/><file name="testIndex.yaml" hash="0a1f21a3417389e0c0a13392c79a7a89"/></dir></dir><file name="Index.php" hash="2771de706303653d039818bd0f6590ea"/></dir><dir name="Model"><dir name="Product"><dir name="expectations"><file name="testGenerator.yaml" hash="232dda1f4fd88b8ef081393f08044731"/></dir><dir name="fixtures"><file name="testGenerator.yaml" hash="df25e3ca67fd98ab1b933c4951c599ef"/></dir><dir name="providers"><file name="testGenerator.yaml" hash="84779d5dcd8d92abdecf0cd5ee65cfb0"/></dir></dir><file name="Product.php" hash="6c45ae2b36c6cc721ef634855ed6d596"/></dir></dir><dir name="controllers"><file name="DoofinderFeedFeedController.php" hash="5226695d0b9f75d960ed67484d16e20d"/><file name="DoofinderFeedLogController.php" hash="c14b9c988721438344fce086d8f6960a"/><file name="FeedController.php" hash="be67f16693d3ad38ed0e34c5ff7727b6"/><file name="IndexController.php" hash="3dbc5c0805d38ff6b4d718d2217e5ca5"/></dir><dir name="etc"><file name="config.xml" hash="8bec1d848992809fcdf5e91897f181ec"/><file name="system.xml" hash="0737fb34cb130408ce96ff46270bdf53"/></dir><dir name="sql"><dir name="doofinder_feed_setup"><file name="mysql4-install-1.5.4.php" hash="9dc5ed4e10febbe75ab1911259a1c9fe"/><file name="mysql4-install-1.5.7.php" hash="2e54d97fe55303f3c73293cf5357864a"/><file name="mysql4-upgrade-1.5.4-1.5.5.php" hash="df7158f6d6cdded9bdfc5cb72c1dc8e3"/><file name="mysql4-upgrade-1.5.5-1.5.6.php" hash="0f3ca5263356a0bc83d9352b463944dc"/><file name="mysql4-upgrade-1.5.6-1.5.7.php" hash="b0180770655f36d6723483aa3bd1541f"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Doofinder_Feed.xml" hash="9d3b6fbbbec12708461c33260715451c"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="doofinder.xml" hash="a7b9105a4e613086340b042845793d9f"/></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="doofinder.xml" hash="48a8636096950914917461260416c355"/></dir></dir></dir></dir></target><target name="mage"><dir name="js"><dir name="doofinder"><file name="admin.js" hash="ca050b0527ae101c75532fbca1c4a274"/></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="doofinder"><file name="styles.css" hash="16d447107e9507136347338f067be156"/></dir></dir></dir></dir></target></contents>
<time>13:11:33</time>
<contents><target name="magecommunity"><dir name="Doofinder"><dir name="Feed"><dir name="Block"><dir name="Adminhtml"><dir name="Log"><file name="View.php" hash="d0b162bf0c2bfc41b17ee9c6a10da7df"/></dir><dir name="Map"><file name="Additional.php" hash="f5470adfcbb81d2fdc19e86fed8e950d"/></dir></dir><file name="Integration.php" hash="9796c14c4b5da38a12cd5b828a5e70cd"/><dir name="Settings"><dir name="Buttons"><file name="Generate.php" hash="90c066898ccc04377137954de94a3388"/><file name="ViewLog.php" hash="6efd3cc55421f9f00d63d26fd0c4a71d"/></dir><dir name="Panel"><file name="Datetime.php" hash="44f03ceb33207bd1987b4792f6316cc3"/><file name="Description.php" hash="c8369dd208b9e8c30b24b533040335eb"/><file name="File.php" hash="9d2c20b41321f019ef375acb49dca2b5"/><file name="Layerdescription.php" hash="35e9a6c1810d2df113b61f7c226b36d8"/><file name="Message.php" hash="7ca862256d181bf014c9705d6673bc1b"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="b4a78df53e40ecc0bc62e5ef98e824cd"/><file name="Log.php" hash="2f7b8e634ab8e362874010829b80fffb"/><file name="Tax.php" hash="95176e549932841e53cff71eda7937b8"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Backend"><file name="Cron.php" hash="f99fdbdb8b1b73c82f902a2373f7fcbf"/></dir></dir></dir></dir><file name="Config.php" hash="7ea3573565a78f3abd6302a0582829eb"/><file name="Cron.php" hash="92579da6bc6d7eeca2683c0ada7b1c3a"/><file name="Generator.php" hash="94eb9223f6a96a98d2fe24187a1b955c"/><file name="Log.php" hash="95440d2fe9e1ed764521658f618d8596"/><dir name="Map"><dir name="Product"><file name="Abstract.php" hash="8e37096e8ccba7c88fc24f5537771def"/><file name="Associated.php" hash="36fea92854d529715262acc6844ffca7"/><file name="Bundle.php" hash="85c7b27412e57fc36682770ab6cd33bc"/><file name="Configurable.php" hash="c5c541f70009bbfbaa9cb364f806ee03"/><file name="Downloadable.php" hash="029f1e4a204b51bea9d4fa8d82a0bdfc"/><file name="Grouped.php" hash="e206b016a2a84a39f0a02c6b7fdea258"/><file name="Simple.php" hash="da36a148cb68aa95b7eb24ea8f6fc0f9"/><file name="Virtual.php" hash="0b2972e5bb58f243c21d4e4678b2d0d3"/></dir></dir><dir name="Mysql4"><dir name="Cron"><file name="Collection.php" hash="1f572387fbfdd0c93689343970b21a0e"/></dir><file name="Cron.php" hash="d0ac8482eeb43859e74719873ae9d7b2"/><dir name="Log"><file name="Collection.php" hash="9a1f24f2df2a4f6d1ec7ad896e2db2d0"/></dir><file name="Log.php" hash="fd381d05e450c2f3bdd3d87df97ff170"/></dir><dir name="Observers"><file name="Feed.php" hash="09fa3463da0e61641a495302005c2753"/><file name="Logs.php" hash="54812df32062ac8e92a63abe16ad1302"/><file name="Schedule.php" hash="42a202c78f3e53c67bdccd69d1bd7d4e"/></dir><dir name="Resource"><dir name="Mysql4"><file name="Setup.php" hash="d5804544a22568da9bd7b63b8a3f5884"/></dir></dir><dir name="System"><dir name="Config"><dir name="Backend"><dir name="Map"><file name="Additional.php" hash="8279c724133c9d0c12d9af255abc7beb"/></dir></dir><file name="Reset.php" hash="b0801dae091f7d54f670b5357c5c6d4d"/><dir name="Source"><dir name="Product"><file name="Attributes.php" hash="82139f995093ebd447ba88d8f8fa0d04"/></dir></dir></dir></dir><file name="Tools.php" hash="b77b8056738ae5f913c72a9fe0ea4a7a"/></dir><dir name="Test"><dir name="Controller"><dir name="Index"><dir name="fixtures"><file name="testConfig.yaml" hash="0a1f21a3417389e0c0a13392c79a7a89"/><file name="testFeed.yaml" hash="694cf25a35a9a301a8ae678866937909"/><file name="testIndex.yaml" hash="0a1f21a3417389e0c0a13392c79a7a89"/></dir><dir name="providers"><file name="testConfig.yaml" hash="0a1f21a3417389e0c0a13392c79a7a89"/><file name="testFeed.yaml" hash="1ea2f638be8fdcea22ef47767ed8d7db"/><file name="testIndex.yaml" hash="0a1f21a3417389e0c0a13392c79a7a89"/></dir></dir><file name="Index.php" hash="2771de706303653d039818bd0f6590ea"/></dir><dir name="Model"><dir name="Product"><dir name="expectations"><file name="testGenerator.yaml" hash="232dda1f4fd88b8ef081393f08044731"/></dir><dir name="fixtures"><file name="testGenerator.yaml" hash="df25e3ca67fd98ab1b933c4951c599ef"/></dir><dir name="providers"><file name="testGenerator.yaml" hash="84779d5dcd8d92abdecf0cd5ee65cfb0"/></dir></dir><file name="Product.php" hash="6c45ae2b36c6cc721ef634855ed6d596"/></dir></dir><dir name="controllers"><file name="DoofinderFeedFeedController.php" hash="855804b88c3a868ddd739051153dc695"/><file name="DoofinderFeedLogController.php" hash="c04285257a64cb83b75a6cb9b1096787"/><file name="FeedController.php" hash="5e86de1a3e02de283fe764da9c9aebc4"/><file name="IndexController.php" hash="9547393ea60f7dd73662ee4d187b9063"/></dir><dir name="etc"><file name="config.xml" hash="82e7b0e4debfc622da7de6f1d88f50a8"/><file name="system.xml" hash="0737fb34cb130408ce96ff46270bdf53"/></dir><dir name="sql"><dir name="doofinder_feed_setup"><file name="mysql4-install-1.5.4.php" hash="9dc5ed4e10febbe75ab1911259a1c9fe"/><file name="mysql4-install-1.5.7.php" hash="2e54d97fe55303f3c73293cf5357864a"/><file name="mysql4-upgrade-1.5.4-1.5.5.php" hash="df7158f6d6cdded9bdfc5cb72c1dc8e3"/><file name="mysql4-upgrade-1.5.5-1.5.6.php" hash="0f3ca5263356a0bc83d9352b463944dc"/><file name="mysql4-upgrade-1.5.6-1.5.7.php" hash="b0180770655f36d6723483aa3bd1541f"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Doofinder_Feed.xml" hash="9d3b6fbbbec12708461c33260715451c"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="doofinder.xml" hash="a7b9105a4e613086340b042845793d9f"/></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="doofinder.xml" hash="48a8636096950914917461260416c355"/></dir></dir></dir></dir></target><target name="mage"><dir name="js"><dir name="doofinder"><file name="admin.js" hash="ca050b0527ae101c75532fbca1c4a274"/></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="doofinder"><file name="styles.css" hash="16d447107e9507136347338f067be156"/></dir></dir></dir></dir></target></contents>
<compatible/>
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
</package>

0 comments on commit 675942a

Please sign in to comment.