From a51f5c8921074cba0501c057846403b7fc5caf74 Mon Sep 17 00:00:00 2001 From: markabur Date: Thu, 29 Jun 2017 08:56:29 -0700 Subject: [PATCH] Simplify example for listing more than 10,000 files --- .../ObjectStore/list-objects-over-10000.php | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/samples/ObjectStore/list-objects-over-10000.php b/samples/ObjectStore/list-objects-over-10000.php index ec349e88d..eeafc5f97 100644 --- a/samples/ObjectStore/list-objects-over-10000.php +++ b/samples/ObjectStore/list-objects-over-10000.php @@ -37,26 +37,20 @@ // 5. Create a list of all objects in the container $containerObjects = array(); -$marker = ''; +$latestFilename = ''; +$batchCount = null; -while ($marker !== null) { +while ($batchCount !== 0) { $params = array( - 'marker' => $marker, + 'marker' => $latestFilename, ); $objects = $container->objectList($params); - $total = $objects->count(); - $count = 0; - - if ($total == 0) { - break; - } + $batchCount = $objects->count(); foreach ($objects as $object) { - /** @var $object OpenCloud\ObjectStore\Resource\DataObject **/ - $containerObjects[] = $object->getName(); - $count++; - - $marker = ($count == $total) ? $object->getName() : null; + /** @var $object \OpenCloud\ObjectStore\Resource\DataObject **/ + $latestFilename = $object->getName(); + $containerObjects[] = $latestFilename; } }