search cleanup

public/src/utils.js

@@ -8,9 +8,13 @@
 		XRegExp = require('xregexp').XRegExp;
 
 		process.profile = function(operation, start) {
+			console.log('%s took %d milliseconds', process.elapsedTimeSince(start));
+		};
+
+		process.elapsedTimeSince = function(start) {
 			var diff = process.hrtime(start);
-			console.log('%s took %d milliseconds', operation, diff[0] * 1e3 + diff[1] / 1e6);
+			return diff[0] * 1e3 + diff[1] / 1e6;
-		}
+		};
 
 	} else {
 		XRegExp = window.XRegExp;

src/controllers/index.js

@@ -87,11 +87,10 @@ Controllers.home = function(req, res, next) {
 };
 
 Controllers.search = function(req, res, next) {
+	var start = process.hrtime();
+
 	if (!req.params.term) {
 		return res.render('search', {
-			show_no_topics: 'hide',
-			show_no_posts: 'hide',
-			show_results: 'hide',
 			search_query: '',
 			posts: [],
 			topics: []
@@ -102,51 +101,49 @@ Controllers.search = function(req, res, next) {
 		return res.redirect('/404');
 	}
 
-	function searchPosts(callback) {
+	function search(index, callback) {
 		plugins.fireHook('filter:search.query', {
-			index: 'post',
+			index: index,
 			query: req.params.term
-		}, function(err, pids) {
+		}, callback);
-			if (err) {
-				return callback(err);
-			}
-
-			posts.getPostSummaryByPids(pids, false, callback);
-		});
-	}
-
-	function searchTopics(callback) {
-		plugins.fireHook('filter:search.query', {
-			index: 'topic',
-			query: req.params.term
-		}, function(err, tids) {
-			if (err) {
-				return callback(err);
-			}
-
-			topics.getTopicsByTids(tids, 0, callback);
-		});
 	}
 
-	async.parallel([searchPosts, searchTopics], function (err, results) {
+	async.parallel({
+		pids: function(next) {
+			search('post', next);
+		},
+		tids: function(next) {
+			search('topic', next);
+		}
+	}, function (err, results) {
 		if (err) {
 			return next(err);
 		}
 
 		if(!results) {
-			results = [];
+			results = {pids:[], tids: []};
-			results[0] = results[1] = [];
 		}
 
-		return res.render('search', {
+		async.parallel({
-			show_no_topics: results[1].length ? 'hide' : '',
+			posts: function(next) {
-			show_no_posts: results[0].length ? 'hide' : '',
+				posts.getPostSummaryByPids(results.pids, false, next);
-			show_results: '',
+			},
-			search_query: req.params.term,
+			topics: function(next) {
-			posts: results[0],
+				topics.getTopicsByTids(results.tids, 0, next);
-			topics: results[1],
+			}
-			post_matches : results[0].length,
+		}, function(err, results) {
-			topic_matches : results[1].length
+			if (err) {
+				return next(err);
+			}
+
+			return res.render('search', {
+				time: process.elapsedTimeSince(start),
+				search_query: req.params.term,
+				posts: results.posts,
+				topics: results.topics,
+				post_matches : results.posts.length,
+				topic_matches : results.topics.length
+			});
 		});
 	});
 };