Bug Fixes

ResearchandDestroy · Aug 3, 2023 · c01e8a6 · c01e8a6
1 parent 0389aad
commit c01e8a6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/DorXNG.py b/DorXNG.py
@@ -99,6 +99,7 @@ def exit_handler(signum, frame):
                 search_params, search_query)
 
     else:
+
         # Gather Variable Definition from Construct URL
         page_iteration_number, reset_page_number, server, previous_server, search_params, search_query = url_construction.construct_url(
                 args, page_iteration_mode, page_iteration_number, reset_page_number,
@@ -134,7 +135,9 @@ def exit_handler(signum, frame):
                       database_results, previous_results, total_current_results)
 
     # Summarize Results
-    if args.loop == 0 or args.loop is not None:
+    if args.loop == 0 and page_iteration_mode is True or args.loop is not None and page_iteration_mode is True:
+        pass
+    elif args.loop == 0 and args.querylist and page_iteration_mode is False or args.loop is not None and args.querylist and page_iteration_mode is False:
         pass
     else:
         print('\nTOTAL NUMBER OF RESULTS: ' + str(len(database_results)))

diff --git a/iterator.py b/iterator.py
@@ -28,6 +28,7 @@ def page_iterator(args, database_name, database_file, detect_database, exceeded_
             # Summarize Results
             print('\nTOTAL NUMBER OF RESULTS: ' + str(len(database_results)) + '\n')
             if args.loop == 0 or args.loop is not None:
+                args.query = query_list[0]
                 return args
             else:
                 exit(0)
@@ -67,6 +68,7 @@ def page_iterator(args, database_name, database_file, detect_database, exceeded_
                     # Summarize Results
                     print('\nTOTAL NUMBER OF RESULTS: ' + str(len(database_results)))
                     if args.loop == 0 or args.loop is not None:
+                        args.query = query_list[0]
                         return args
                     else:
                         exit(0)
@@ -177,6 +179,7 @@ def page_iterator(args, database_name, database_file, detect_database, exceeded_
                     # Summarize Results
                     print('\nTOTAL NUMBER OF RESULTS: ' + str(len(database_results)))
                     if args.loop == 0 or args.loop is not None:
+                        args.query = query_list[0]
                         return args
                     else:
                         exit(0)