Fixed incorrect full rebuild of search index.

Author: nqxcode

src/Nqxcode/LuceneSearch/Console/RebuildCommand.php

@@ -66,11 +66,15 @@ private function rebuild()
 
         $this->searchIndexRotator = App::make('search.index.rotator');
         $queue = Config::get('laravel-lucene-search::queue');
-        $indexPath = Config::get('laravel-lucene-search::index.path');
 
         $modelRepositories = $this->search->config()->repositories();
-
         if (count($modelRepositories) > 0) {
+
+            $originalIndexPath = Config::get('laravel-lucene-search::index.path');
+            $newIndexPath = $this->searchIndexRotator->getNewIndexPath();
+
+            Config::set('laravel-lucene-search::index.path', $newIndexPath);
+
             foreach ($modelRepositories as $modelRepository) {
                 $this->info('Creating index for model: "' . get_class($modelRepository) . '"');
 
@@ -85,8 +89,7 @@ private function rebuild()
                 $progress = new ProgressBar($this->getOutput(), $count / $chunkCount);
                 $progress->start();
 
-                $modelRepository->chunk($chunkCount, function ($chunk) use ($progress, $queue) {
-                    $newIndexPath = $this->searchIndexRotator->getNewIndexPath();
+                $modelRepository->chunk($chunkCount, function ($chunk) use ($progress, $queue, $newIndexPath) {
 
                     if ($queue) {
                         Queue::push(
@@ -99,7 +102,6 @@ private function rebuild()
                             $queue);
 
                     } else {
-                        Config::set('laravel-lucene-search::index.path', $newIndexPath);
                         foreach ($chunk as $model) {
                             $this->search->update($model);
                         }
@@ -111,7 +113,11 @@ private function rebuild()
                 $progress->finish();
                 $this->info(PHP_EOL);
             }
+
+            Config::set('laravel-lucene-search::index.path', $originalIndexPath);
+
             $this->info(PHP_EOL . 'Operation is fully complete!');
+
         } else {
             $this->error('No models found in config.php file..');
         }
@@ -124,7 +130,5 @@ private function rebuild()
         } else {
             $this->searchIndexRotator->rotate();
         }
-
-        Config::set('laravel-lucene-search::index.path', $indexPath);
     }
 }

src/Nqxcode/LuceneSearch/Job/MassUpdateSearchIndex.php

@@ -14,6 +14,7 @@ public function fire($job, array $jobData)
         $modelKeys = $jobData['modelKeys'];
         $indexPath = $jobData['indexPath'];
 
+        $originalIndexPath = Config::get('laravel-lucene-search::index.path');
         Config::set('laravel-lucene-search::index.path', $indexPath);
 
         foreach ($modelKeys as $modelKey) {
@@ -23,6 +24,8 @@ public function fire($job, array $jobData)
             }
         }
 
+        Config::set('laravel-lucene-search::index.path', $originalIndexPath);
+
         $job->delete();
     }
 }