remove some old code, update limit

satsearch/cli.py

@@ -38,7 +38,6 @@ def __init__(self, *args, **kwargs):
         self.output_group.add_argument('--print-md', help=h, default=None, nargs='*', dest='printmd')
         h = 'Print calendar showing dates'
         self.output_group.add_argument('--print-cal', help=h, dest='printcal')
-        #h = 'Print Item Asset definition from Collections'
         self.output_group.add_argument('--save', help='Save results as GeoJSON', default=None)
 
     def parse_args(self, *args, **kwargs):

satsearch/search.py

@@ -87,7 +87,7 @@ def collection(self, cid, headers=None):
 
     def items(self, limit=10000, page_limit=500, headers=None):
         """ Return all of the Items and Collections for this search """
-        found = 0 #self.found(headers=headers)
+        found = self.found(headers=headers)
         limit = self.limit or limit
         if found > limit:
             logger.warning('There are more items found (%s) than the limit (%s) provided.' % (found, limit))
@@ -100,9 +100,8 @@ def items(self, limit=10000, page_limit=500, headers=None):
             'merge': False
         }
 
-        maxitems = limit #min(found, limit)
         items = []
-        while nextlink and len(items) < maxitems:
+        while nextlink and len(items) < limit:
             if nextlink.get('method', 'GET') == 'GET':
                 resp = self.query(url=nextlink['href'], headers=headers, **self.kwargs)
             else:

test/test_search.py

@@ -75,10 +75,6 @@ def test_get_ids_search(self):
         assert(search.found() == 4)
         assert(len(items) == 4)
 
-    #def _test_query_bad_url(self):
-    #    with self.assertRaises(SatSearchError):
-    #        Search.query(url=os.path.join(API_URL, 'collections/nosuchcollection'))
-
     def test_search_query_operator(self):
         expected = {'collections': ['sentinel-s2-l1c'], 'query': {'eo:cloud_cover': {'lte': '10'}, 'data_coverage': {'gt': '80'}}}
         instance = Search.search(collections=['sentinel-s2-l1c'],