Commit 7b9ae573 authored by Sebastian Kummer's avatar Sebastian Kummer

ZP-1047 Count the elements to be moved only once.

Released under the Affero GNU General Public License (AGPL) version 3.
parent 900eb438
...@@ -88,6 +88,7 @@ class MoveItems extends RequestProcessor { ...@@ -88,6 +88,7 @@ class MoveItems extends RequestProcessor {
$operationResults = array(); $operationResults = array();
$operationCounter = 0; $operationCounter = 0;
$operationTotal = count($moves);
foreach($moves as $move) { foreach($moves as $move) {
$operationCounter++; $operationCounter++;
self::$encoder->startTag(SYNC_MOVE_RESPONSE); self::$encoder->startTag(SYNC_MOVE_RESPONSE);
...@@ -145,7 +146,7 @@ class MoveItems extends RequestProcessor { ...@@ -145,7 +146,7 @@ class MoveItems extends RequestProcessor {
} }
if ($operationCounter % 10 == 0) { if ($operationCounter % 10 == 0) {
self::$topCollector->AnnounceInformation(sprintf("Moved %d objects out of %d", $operationCounter, count($moves))); self::$topCollector->AnnounceInformation(sprintf("Moved %d objects out of %d", $operationCounter, $operationTotal));
} }
// save the operation result // save the operation result
...@@ -164,7 +165,7 @@ class MoveItems extends RequestProcessor { ...@@ -164,7 +165,7 @@ class MoveItems extends RequestProcessor {
self::$encoder->endTag(); self::$encoder->endTag();
} }
self::$topCollector->AnnounceInformation(sprintf("Moved %d - Codes", count($moves)), true); self::$topCollector->AnnounceInformation(sprintf("Moved %d - Codes", $operationTotal), true);
foreach ($operationResults as $status => $occurences) { foreach ($operationResults as $status => $occurences) {
self::$topCollector->AnnounceInformation(sprintf("%dx%d", $occurences, $status), true); self::$topCollector->AnnounceInformation(sprintf("%dx%d", $occurences, $status), true);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment