part 1 of search change

src/database/mongo.js

@@ -112,6 +112,8 @@
 
 				createIndex('search', {content:'text'}, {background:true});
 				createIndex('search', {key: 1, id: 1}, {background:true});
+				createIndex('search', {cid: 1}, {background:true});
+				createIndex('search', {uid: 1}, {background:true});
 
 				if (typeof callback === 'function') {
 					callback();

src/database/mongo/main.js

@@ -5,15 +5,19 @@ var winston = require('winston');
 module.exports = function(db, module) {
 	var helpers = module.helpers.mongo;
 
-	module.searchIndex = function(key, content, id, callback) {
+	module.searchIndex = function(key, data, id, callback) {
 		callback = callback || function() {};
-		var data = {
+		var setData = {
 			id: id,
-			key: key,
-			content: content
+			key: key
 		};
+		for(var field in data) {
+			if (data.hasOwnProperty(field)) {
+				setData[field] = data[field];
+			}
+		}
 
-		db.collection('search').update({key:key, id:id}, {$set:data}, {upsert:true, w: 1}, function(err) {
+		db.collection('search').update({key: key, id: id}, {$set: setData}, {upsert:true, w: 1}, function(err) {
 			if(err) {
 				winston.error('Error indexing ' + err.message);
 			}
@@ -21,13 +25,29 @@ module.exports = function(db, module) {
 		});
 	};
 
-	module.search = function(key, term, limit, callback) {
-		db.collection('search').find({ $text: { $search: term }, key: key}, {limit: limit}).toArray(function(err, results) {
-			if(err) {
+	module.search = function(key, data, limit, callback) {
+		var searchQuery = {
+			key: key
+		};
+
+		if (data.content) {
+			searchQuery.$text = {$search: data.content};
+		}
+
+		if (data.cid) {
+			searchQuery.cid = data.cid;
+		}
+
+		if (data.uid) {
+			searchQuery.uid = data.uid;
+		}
+
+		db.collection('search').find(searchQuery, {limit: limit}).toArray(function(err, results) {
+			if (err) {
 				return callback(err);
 			}
 
-			if(!results || !results.length) {
+			if (!results || !results.length) {
 				return callback(null, []);
 			}
 

src/database/redis.js

@@ -9,7 +9,7 @@
 		utils = require('./../../public/src/utils.js'),
 		redis,
 		connectRedis,
-		reds,
+		redisSearch,
 		redisClient,
 		postSearch,
 		topicSearch;
@@ -41,7 +41,7 @@
 		try {
 			redis = require('redis');
 			connectRedis = require('connect-redis')(session);
-			reds = require('reds');
+			redisSearch = require('redisearch');
 		} catch (err) {
 			winston.error('Unable to initialize Redis! Is Redis installed? Error :' + err.message);
 			process.exit();
@@ -56,12 +56,8 @@
 			ttl: 60 * 60 * 24 * 14
 		});
 
-		reds.createClient = function () {
-			return reds.client || (reds.client = redisClient);
-		};
-
-		module.postSearch = reds.createSearch('nodebbpostsearch');
-		module.topicSearch = reds.createSearch('nodebbtopicsearch');
+		module.postSearch = redisSearch.createSearch('nodebbpostsearch', redisClient);
+		module.topicSearch = redisSearch.createSearch('nodebbtopicsearch', redisClient);
 
 		require('./redis/main')(redisClient, module);
 		require('./redis/hash')(redisClient, module);

src/database/redis/main.js

@@ -1,27 +1,19 @@
 "use strict";
 
 module.exports = function(redisClient, module) {
-	module.searchIndex = function(key, content, id, callback) {
+	module.searchIndex = function(key, data, id, callback) {
 		if (key === 'post') {
-			module.postSearch.index(content, id, callback);
+			module.postSearch.index(data, id, callback);
 		} else if(key === 'topic') {
-			module.topicSearch.index(content, id, callback);
+			module.topicSearch.index(data, id, callback);
 		}
 	};
 
-	module.search = function(key, term, limit, callback) {
-		function search(searchObj, callback) {
-			searchObj
-				.query(term)
-				.between(0, limit - 1)
-				.type('or')
-				.end(callback);
-		}
-
-		if(key === 'post') {
-			search(module.postSearch, callback);
+	module.search = function(key, data, limit, callback) {
+		if (key === 'post') {
+			module.postSearch.query(data, 0, limit - 1, callback);
 		} else if(key === 'topic') {
-			search(module.topicSearch, callback);
+			module.topicSearch.query(data, 0, limit - 1, callback);
 		}
 	};