svn: /pear/packages/Services_Amazon_S3/trunk/S3/ ObjectIterator.php

schmidt Sun, 02 Aug 2009 12:53:25 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=286662 Log: use the <NextMarker> element from the response rather than using the latest key. Changed paths: U pear/packages/Services_Amazon_S3/trunk/S3/ObjectIterator.php Modified: pear/packages/Services_Amazon_S3/trunk/S3/ObjectIterator.php =================================================================== --- pear/packages/Services_Amazon_S3/trunk/S3/ObjectIterator.php 2009-08-02 12:50:54 UTC (rev 286661) +++ pear/packages/Services_Amazon_S3/trunk/S3/ObjectIterator.php 2009-08-02 12:53:25 UTC (rev 286662) @@ -102,6 +102,13 @@ private $_current; /** + * The value that should be used for the marker parameter in the next + * request. + * @var string + */ + private $_nextMarker; + + /** * Do XPath queries on last request * @var DOMXPath */ @@ -274,7 +281,7 @@ $query['max-keys'] = $this->maxKeys; } if ($this->_isTruncated) { - $query['marker'] = $this->_current->key; + $query['marker'] = $this->_nextMarker; } if ($this->delimiter) { $query['delimiter'] = $this->delimiter; @@ -291,6 +298,8 @@ /s3:ListBucketResult/s3:CommonPrefixes/s3:Prefix/text()'); $this->_isTruncated = $this->_xPath->evaluate( 'string(/s3:ListBucketResult/s3:IsTruncated) = "true"'); + $this->_nextMarker = $this->_xPath->evaluate( + 'string(/s3:ListBucketResult/s3:NextMarker)'); $this->_currentIndex = 0; } }