Merge pull request #7 from notmatt/master

Pagination termination condition
TritonDataCenter · Sep 9, 2011 · 27719ad · 27719ad
2 parents 03eaf17 + 74de9aa
commit 27719ad
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/lib/cloudapi.js b/lib/cloudapi.js
@@ -633,7 +633,8 @@ CloudAPI.prototype.countMachines = function(account, options, callback) {
 
       var done = true;
       if (headers['x-resource-count'] && headers['x-query-limit'])
-        done = (headers['x-resource-count'] < headers['x-query-limit']);
+        done = (parseInt(headers['x-resource-count'], 10) <
+                parseInt(headers['x-query-limit'], 10) + req.query.offset);
 
       var count = +headers['x-resource-count'];
 
@@ -723,7 +724,7 @@ CloudAPI.prototype.listMachines = function(account, options, tags, callback) {
       var done = true;
       if (headers['x-resource-count'] && headers['x-query-limit'])
         done = (parseInt(headers['x-resource-count'], 10) <
-                parseInt(headers['x-query-limit'], 10));
+                parseInt(headers['x-query-limit'], 10) + req.query.offset);
 
       log.debug('CloudAPI._get(%s) -> err=%o, obj=%o, done=%s',
                 req.path, err, obj, done);