Commit 66aea025 authored by Markus Kalkbrenner's avatar Markus Kalkbrenner Committed by Thomas Seiber
Browse files

Issue #3270695 by mkalkbrenner, drunken monkey: Improved status messages during indexing.

parent 0b208bc5

CHANGELOG.txt

+2 −0
Changes for CHANGELOG.txt: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line 
Search API 1.x, dev (xxxx-xx-xx):

---------------------------------

- #3270695 by mkalkbrenner, drunken monkey: Improved status messages during

  indexing.

- #3268953 by drunken monkey: Changed indents in composer.json to 4 spaces.

- #3168162 by gabesullice, drunken monkey, mkalkbrenner: Updated to latest

  changes in Event system.

src/IndexBatchHelper.php

+2 −2
Changes for src/IndexBatchHelper.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ class IndexBatchHelper { 
      $context['results']['indexed'] += $indexed;

      // Display progress message.

      if ($indexed > 0) {

        $context['message'] = static::formatPlural($context['results']['indexed'], 'Successfully indexed 1 item.', 'Successfully indexed @count items.');

        $context['message'] = static::formatPlural($context['results']['indexed'], 'Successfully indexed 1 item on @index.', 'Successfully indexed @count items on @index.', ['@index' => $index->label()]);

      }

      // Everything has been indexed?

      if ($indexed === 0 || $context['results']['indexed'] >= $context['sandbox']['original_item_count']) {
@@ -170,7 +170,7 @@ class IndexBatchHelper { 
    catch (\Exception $e) {

      // Log exception to watchdog and abort the batch job.

      watchdog_exception('search_api', $e);

      $context['message'] = static::t('An error occurred during indexing: @message', ['@message' => $e->getMessage()]);

      $context['message'] = static::t('An error occurred during indexing on @index: @message', ['@index' => $index->label(), '@message' => $e->getMessage()]);

      $context['finished'] = 1;

      $context['results']['not indexed'] = $context['sandbox']['original_item_count'] - $context['results']['indexed'];

    }