properly support search queries in viewfeed debugger, improve some debugging messages and output

2 files changed, 27 insertions, 3 deletions

diff --git a/classes/Feeds.php b/classes/Feeds.php
index f44be22bf..5239c9f8a 100644
--- a/classes/Feeds.php
+++ b/classes/Feeds.php
@@ -547,7 +547,13 @@ class Feeds extends Handler_Protected {
 		// this is parsed by handleRpcJson() on first viewfeed() to set cdm expanded, etc
 		$reply['runtime-info'] = RPC::_make_runtime_info();
 
-		print json_encode($reply);
+		if (!empty($_REQUEST["debug"])) {
+			print "\n*** HEADLINE DATA ***\n";
+
+			print json_encode($reply, JSON_PRETTY_PRINT);
+		} else {
+			print json_encode($reply);
+		}
 	}
 
 	/**
@@ -2376,6 +2382,12 @@ class Feeds extends Handler_Protected {
 		else
 			$search_query_part = "false";
 
+		if (!empty($_REQUEST["debug"])) {
+			print "\n*** SEARCH_TO_SQL ***\n";
+			print "QUERY: $search_query_part\n";
+			print "WORDS: " . json_encode($search_words) . "\n";
+		}
+
 		return array($search_query_part, $search_words);
 	}
 
diff --git a/js/App.js b/js/App.js
index de653e306..0c4c72f22 100644
--- a/js/App.js
+++ b/js/App.js
@@ -1158,8 +1158,20 @@ const App = {
          };
 
          this.hotkey_actions["feed_debug_viewfeed"] = () => {
-            App.postOpenWindow("backend.php", {op: "Feeds", method: "view",
-               feed: Feeds.getActive(), timestamps: 1, debug: 1, cat: Feeds.activeIsCat(), csrf_token: __csrf_token});
+
+				let query = {
+					...{op: "Feeds", method: "view", feed: Feeds.getActive(), timestamps: 1,
+							debug: 1, cat: Feeds.activeIsCat(), csrf_token: __csrf_token},
+					...dojo.formToObject("toolbar-main")
+				};
+
+				if (Feeds._search_query) {
+					query = Object.assign(query, Feeds._search_query);
+				}
+
+				console.log('debug_viewfeed', query);
+
+				App.postOpenWindow("backend.php", query);
          };
 
          this.hotkey_actions["feed_edit"] = () => {