Fixed Hit Count Error

	modified:   scripts/field.py
	modified:   scripts/utils.py

Author: keballantyne

scripts/field.py

@@ -213,11 +213,6 @@ def add_field(self, **kwargs):
     def get_eod_fieldnames(self, sort=False, lowered=False):
         """
         Gets the list of EOD fieldnames.
-        
-        :param sort: Determines whether to sort the list of fieldnames alphabetically.
-        :type  sort: boolean
-        :param lowered: Determines whether to return the fieldnames in lowercase.
-        :type  lowered: boolean
 
         :return: A list of EOD filenames.
         :rtype: list

scripts/utils.py

@@ -830,16 +830,18 @@ def check_hit_count(self):
         filters = self.rapi_search_args.get('filters')
         features = self.rapi_search_args.get('features')
         dates = self.rapi_search_args.get('dates')
-        resultFields = self.rapi_search_args.get('resultFields')
-        maxResults = self.rapi_search_args.get('maxResults')
+        result_fields = self.rapi_search_args.get('resultFields')
+        max_res = self.rapi_search_args.get('maxResults')
 
         # Get hit count
         print(f"\nGetting hit count...")
         hit_count = self.eodms_rapi.search(self.coll_id, filters, features, 
-                                           dates, resultFields, maxResults, 
-                                           True).get('hitCount')
+                                           dates, result_fields, max_res, 
+                                           hit_count=True).get('hitCount')
 
-        print(f"Hit Count for Search: {hit_count}")
+        msg = f"Hit Count for Search: {hit_count}"
+        print(f"\n{msg}")
+        self.logger.info(msg)
 
         return hit_count
 
@@ -1520,17 +1522,18 @@ def query_entries(self, collections, **kwargs):
             for k, v in self.rapi_search_args.items():
                 print(f"  {k}: {v}")
 
-            if max_images is None or max_images == '':
-                # Check hit count for the search
-                hit_count = self.check_hit_count()
-                max_images = hit_count
+            # Check hit count for the search
+            hit_count = self.check_hit_count()
 
             if hit_count == 0:
                 msg = "Sorry, no results found for given AOI or filters."
                 self.print_msg(msg, heading="warning")
                 self.logger.warning(msg)
                 self.exit_cli()
 
+            if max_images is None or max_images == '' or max_images > hit_count:
+                max_images = hit_count
+
             if max_images > 1500:
                 msg = f"""The hit count for this search is too high. The RAPI will most likely timeout. 
 Please separate your searches into separate commands, narrowing your searches with other filters (such as adding a date range(s)).