Merge remote-tracking branch 'origin/master' into develop

avstudnitz · avstudnitz · commit 2f171b314d57 · 2017-07-11T08:35:19.000+02:00
diff --git a/composer.json b/composer.json
@@ -5,7 +5,7 @@
   "homepage": "https://github.com/integer-net/solr-magento1",
   "require": {
     "aoepeople/aoe_layoutconditions": "~1.0.0",
-    "integer-net/solr-base": "~1.0.0"
+    "integer-net/solr-base": "~2.0.0"
   },
   "require-dev": {
     "ecomdev/ecomdev_phpunit": "dev-dev",
diff --git a/doc/release-notes.md b/doc/release-notes.md
@@ -0,0 +1,52 @@
+IntegerNet_Solr Free for Magento 1
+===============
+Release Notes
+
+Version 1.7.3 (May 18, 2017)
+---------------
+
+- Bugfix regarding RWD theme
+
+Version 1.7.2 (May 16, 2017)
+---------------
+
+- Add slicing functionality (see src/shell/integernet-solr.php)
+- Fix bug with indexing multistore products with activated flat catalog
+- Exclude items with zero counts from filter items count calculation (thanks @tim-bezhashvyly!)
+- Fallback to Magento if category is excluded from Solr index (thanks @tim-bezhashvyly!)
+- Move files regarding autosuggest to Pro module 
+
+Version 1.7.1 (May 3, 2017)
+---------------
+
+- Support Indexing of Bundle Child Products
+- Optimization of Search Results for search queries containing numbers
+- Bugfix regarding Flat Product Setting
+- Bugfix regarding Flat Category Setting
+- Bugfix regarding Re-Initialization of MySQL Connection
+- Bugfix regarding duplicate Layout Update (thanks @tim-bezhashvyly!)
+
+Version 1.7.0 (Oct 12, 2016)
+---------------
+
+- First public release of IntegerNet_Solr Free
+
+Version 1.6.0 (Aug 1, 2016)
+---------------
+
+- Improved search algorithm, e.g. for search terms containing both words and numbers
+- Category and CMS pages in autosuggest results
+- More configuration options for filters
+- Improved compatibility with other third party extensions
+
+Version 1.5.0 (Mar 7, 2016)
+---------------
+
+This is a completely refactored version. Plus, we added quite a number of new features, improving usability, search results and SEO:    
+
+- Select multiple filter values
+- Horizontal display of filters on search result pages
+- Select per category which filters shall be available
+- Configurable meta robots tag (NOINDEX, NOFOLLOW) for search result pages, filtered search results and filtered category pages
+- Adjustable boost for products in search results if they are in a category whose name matches the search term
+- Direct redirects to a product or category page if the search term is an exact match with the product name, SKU, category name, or a different attribute of your choice
diff --git a/src/app/code/community/IntegerNet/Solr/Block/Result/Layer/View.php b/src/app/code/community/IntegerNet/Solr/Block/Result/Layer/View.php
@@ -134,7 +134,7 @@ protected function _getFilter($attribute, $attributeFacets)
     {
         $filter = new Varien_Object();
         $filter->setName($attribute->getStoreLabel());
-        $filter->setItemsCount(sizeof($attributeFacets));
+        $filter->setItemsCount(sizeof(array_filter($attributeFacets)));
         $filter->setIdentifier($attribute->getAttributeCode());
         $filter->setHtml(
             $this->_getFilterBlock()
@@ -155,7 +155,7 @@ protected function _getIntervalFilter($attribute, $attributeFacetData)
     {
         $filter = new Varien_Object();
         $filter->setName($attribute->getStoreLabel());
-        $filter->setItemsCount(sizeof($attributeFacetData));
+        $filter->setItemsCount(sizeof(array_filter($attributeFacetData)));
         $filter->setIdentifier($attribute->getAttributeCode());
         $filter->setHtml(
             $this->_getFilterBlock()
@@ -176,7 +176,7 @@ protected function _getRangeFilter($attribute, $attributeFacetData)
     {
         $filter = new Varien_Object();
         $filter->setName($attribute->getStoreLabel());
-        $filter->setItemsCount(sizeof($attributeFacetData['counts']));
+        $filter->setItemsCount(sizeof(array_filter($attributeFacetData['counts'])));
         $filter->setIdentifier($attribute->getAttributeCode());
         $filter->setHtml(
             $this->_getFilterBlock()
@@ -196,7 +196,7 @@ protected function _getCategoryFilter($categoryFacets)
     {
         $filter = new Varien_Object();
         $filter->setName(Mage::helper('catalog')->__('Category'));
-        $filter->setItemsCount(sizeof($categoryFacets));
+        $filter->setItemsCount(sizeof(array_filter($categoryFacets)));
         $filter->setIdentifier('category');
 
         /** @var IntegerNet_Solr_Block_Result_Layer_Filter $filterBlock */
@@ -251,4 +251,4 @@ protected function _getFilterBlock()
     {
         return $this->getChild('filter')->reset();
     }
-}
+}
diff --git a/src/app/code/community/IntegerNet/Solr/Model/Bridge/ProductRepository.php b/src/app/code/community/IntegerNet/Solr/Model/Bridge/ProductRepository.php
@@ -66,12 +66,25 @@ function($parentId, $childrenIds) {
     }
 
     /**
+     * @param null|int $sliceId
+     * @param null|int $totalNumberSlices
      * @return int[]
      */
-    public function getAllProductIds()
+    public function getAllProductIds($sliceId = null, $totalNumberSlices = null)
     {
+        // Fixes a bug with flat product collections called for different stores, see https://magento.stackexchange.com/q/30956/2207
+        Mage::unregister('_resource_singleton/catalog/product_flat');
+
         /** @var $productCollection Mage_Catalog_Model_Resource_Product_Collection */
         $productCollection = Mage::getResourceModel('catalog/product_collection');
+
+        if ((!is_null($sliceId)) && (!is_null($totalNumberSlices))) {
+            if ($sliceId == $totalNumberSlices) {
+                $sliceId = 0;
+            }
+            $productCollection->getSelect()->where('e.entity_id % ' . intval($totalNumberSlices) . ' = ' . intval($sliceId));
+        }
+
         return $productCollection->getAllIds();
     }
 
diff --git a/src/app/code/community/IntegerNet/Solr/etc/config.xml b/src/app/code/community/IntegerNet/Solr/etc/config.xml
@@ -2,7 +2,7 @@
 <config>
     <modules>
         <IntegerNet_Solr>
-            <version>1.7.1</version>
+            <version>1.7.3</version>
             <version_suffix />
         </IntegerNet_Solr>
     </modules>
diff --git a/src/app/design/frontend/base/default/layout/integernet/solr.xml b/src/app/design/frontend/base/default/layout/integernet/solr.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0"?>
 <layout version="0.1.0">
 
-    <default>
-        <reference name="head">
-            <action method="addCss" ifconfig="integernet_solr/general/is_active">
-                <stylesheet>integernet/solr/css/autosuggest.css</stylesheet>
-            </action>
-        </reference>
-    </default>
-
     <catalogsearch_result_index>
         <reference name="head">
             <action method="addItem" ifconfig="integernet_solr/general/is_active">
diff --git a/src/app/design/frontend/rwd/default/layout/integernet/solr.xml b/src/app/design/frontend/rwd/default/layout/integernet/solr.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0"?>
 <layout version="0.1.0">
 
-    <default>
-        <reference name="head">
-            <action method="addCss" ifconfig="integernet_solr/general/is_active">
-                <stylesheet>integernet/solr/css/autosuggest.css</stylesheet>
-            </action>
-        </reference>
-    </default>
-
     <catalogsearch_result_index>
         <reference name="head">
             <action method="addItem" ifconfig="integernet_solr/general/is_active">
@@ -115,9 +107,6 @@
             <action method="setListModes"/>
             <action method="setListCollection"/>
         </reference>
-        <reference name="before_body_end">
-            <block type="integernet_solr/js" name="solr.js" template="integernet/solr/js.phtml" />
-        </reference>
     </catalog_category_layered>
 
     <catalog_category_default>
diff --git a/src/shell/integernet-solr.php b/src/shell/integernet-solr.php
@@ -67,6 +67,73 @@ public function run()
                 echo $e->getMessage() . "\n";
             }
 
+        } else if ($this->getArg('reindex_slice')) {
+            $storeIdentifiers = $this->getArg('stores');
+            if (!$storeIdentifiers) {
+                $storeIdentifiers = 'all';
+            }
+            $storeIds = $this->_getStoreIds($storeIdentifiers);
+
+            $autoloader = new IntegerNet_Solr_Helper_Autoloader();
+            $autoloader->createAndRegister();
+
+            try {
+                $sliceArg = $this->getArg('slice');
+                $this->_checkSliceArgument($sliceArg);
+                list($sliceId, $totalNumberSlices) = explode('/', $sliceArg);
+
+                $indexer = Mage::helper('integernet_solr')->factory()->getProductIndexer();
+
+                if ($this->getArg('use_swap_core')) {
+                    $indexer->activateSwapCore();
+                }
+                $indexer->reindex(null, false, $storeIds, $sliceId, $totalNumberSlices);
+                if ($this->getArg('use_swap_core')) {
+                    $indexer->deactivateSwapCore();
+                }
+
+                $storeIdsString = implode(', ', $storeIds);
+                echo "Solr product index rebuilt for Stores {$storeIdsString}.\n";
+                echo '(Slice ' . $sliceId . ' of ' . $totalNumberSlices . ')' . "\n";
+            } catch (Exception $e) {
+                echo $e->getMessage() . "\n";
+            }
+
+        } else if ($this->getArg('clear')) {
+            $storeIdentifiers = $this->getArg('stores');
+            if (!$storeIdentifiers) {
+                $storeIdentifiers = 'all';
+            }
+            $storeIds = $this->_getStoreIds($storeIdentifiers);
+            $indexer = Mage::helper('integernet_solr')->factory()->getProductIndexer();
+            if ($this->getArg('use_swap_core')) {
+                $indexer->activateSwapCore();
+            }
+            foreach($storeIds as $storeId) {
+                $indexer->clearIndex($storeId);
+            }
+            if ($this->getArg('use_swap_core')) {
+                $indexer->deactivateSwapCore();
+            }
+            $storeIdsString = implode(', ', $storeIds);
+            echo "Solr product index cleared for Stores {$storeIdsString}.\n";
+
+        } else if ($this->getArg('swap_cores')) {
+            $storeIdentifiers = $this->getArg('stores');
+            if (!$storeIdentifiers) {
+                $storeIdentifiers = 'all';
+            }
+            $storeIds = $this->_getStoreIds($storeIdentifiers);
+            $indexer = Mage::helper('integernet_solr')->factory()->getProductIndexer();
+            try {
+                $indexer->checkSwapCoresConfiguration($storeIds);
+                $indexer->swapCores($storeIds);
+                $storeIdsString = implode(', ', $storeIds);
+                echo "Solr cores swapped for Stores {$storeIdsString}.\n";
+            } catch (Exception $e) {
+                echo $e->getMessage() . "\n";
+            }
+
         } else {
             echo $this->usageHelp();
         }
@@ -82,12 +149,27 @@ public function usageHelp()
 Usage:  php -f integernet-solr.php -- [options]
         php -f integernet-solr.php -- reindex --stores de
         php -f integernet-solr.php -- reindex --stores all --emptyindex
+        php -f integernet-solr.php -- reindex --stores 1 --slice 1/5 --use_swap_core
+        php -f integernet-solr.php -- clear --stores 1
 
-  reindex           reindex solr for given stores (see "stores" param)
-  --stores <stores> reindex given stores (can be store id, store code, comma seperated. Or "all".) If not set, reindex all stores.
+  reindex           Reindex solr for given stores (see "stores" param)
+  --stores <stores> Reindex given stores (can be store id, store code, comma seperated. Or "all".) If not set, reindex all stores.
   --emptyindex      Force emptying the solr index for the given store(s). If not set, configured value is used.
   --noemptyindex    Force not emptying the solr index for the given store(s). If not set, configured value is used.
   --types <types>   Restrict indexing to certain entity types, i.e. "product", "category" or "page" (comma separated). Or "all". If not set, reindex products.
+
+  reindex_slice     Reindex solr for given stores (see "stores" param). Use this if you want to index only a part of the products, i.e. for letting indexing run in parallel (for products only).
+  --slice <number>/<total_number>, i.e. "1/5" or "2/5". 
+  --stores <stores> Reindex given stores (can be store id, store code, comma seperated. Or "all".) If not set, reindex all stores.
+  --use_swap_core   Use swap core for indexing instead of live solr core (only if configured correctly).
+  
+  clear             Clear solr product index for given stores (see "stores" param and "use_swap_core" param)
+  --stores <stores> Reindex given stores (can be store id, store code, comma seperated. Or "all".) If not set, reindex all stores.
+  --use_swap_core   Use swap core for clearing instead of live solr core (only if configured correctly).
+  
+  swap_cores        Swap cores. This is useful if using slices (see above) after indexing with the "--use_swap_core" param; it's not needed otherwise.
+  --stores <stores> Reindex given stores (can be store id, store code, comma seperated. Or "all".) If not set, reindex all stores.
+  
   help              This help
 
 USAGE;
@@ -149,6 +231,32 @@ protected function _useCmsIndexer()
     {
         return Mage::helper('core')->isModuleEnabled('IntegerNet_SolrPro') && Mage::getStoreConfigFlag('integernet_solr/cms/is_active');
     }
+
+    /**
+     * @param string $sliceArg
+     * @throws InvalidArgumentException
+     */
+    protected function _checkSliceArgument($sliceArg)
+    {
+        if (!strlen($sliceArg)) {
+            throw new InvalidArgumentException('The "slice" argument must be given.');
+        }
+        if (strpos($sliceArg, '/') < 1) {
+            throw new InvalidArgumentException('The "slice" argument must be of format "1/5" or "20/20"');
+        }
+        list($sliceId, $totalNumberSlices) = explode('/', $sliceArg);
+        $sliceId = intval($sliceId);
+        $totalNumberSlices = intval($totalNumberSlices);
+        if (!is_integer($sliceId) || !is_integer($totalNumberSlices)) {
+            throw new InvalidArgumentException('The "slice" argument must be of format "1/5" or "20/20", only containing integer numbers before/after the slash.');
+        }
+        if ($totalNumberSlices < 2) {
+            throw new InvalidArgumentException('The "slice" argument must be of format "1/5" or "20/20". The second number must be higher than 1.');
+        }
+        if ($sliceId < 1 || $sliceId > $totalNumberSlices) {
+            throw new InvalidArgumentException('The "slice" argument must be of format "1/5" or "20/20". The first number is invalid, should be between 1 and the second number (including those).');
+        }
+    }
 }
 
 $shell = new IntegerNet_Solr_Shell();
