Merge pull request #261 from marklise/master

MEM-510: Search Improvements.
bcgov · Sep 22, 2017 · de0a60f · de0a60f
2 parents 31908b2 + 61c4c70
commit de0a60f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/modules/core/server/controllers/core.dbmodel.controller.js b/modules/core/server/controllers/core.dbmodel.controller.js
@@ -372,7 +372,10 @@ _.extend (DBModel.prototype, {
 				q = _.extend (q, {"documentDate" : { $lte : new Date(dateRangeEnd) }});
 			}
 			if (project) {
-				q = _.extend (q, {"project" : project});
+				var projects = project.split(',');
+				if (projects.length > 0) {
+					q = _.extend(q, { "project": {$in : projects}});
+				}
 			}
 			console.log("q:", q);
 

diff --git a/modules/search/server/routes/search.routes.js b/modules/search/server/routes/search.routes.js
@@ -24,7 +24,9 @@ module.exports = function (app) {
                     var projectQuery = {};
                     // TODO: Make sure this is a valid objectID, wrap with try/catches.
                     if (req.query.project) {
-                        projectQuery = { _id: req.query.project };
+                        projects = req.query.project.split(',');
+                        projectQuery = _.extend (projectQuery, { "_id": {$in : projects}});
+                        console.log("project query:", projectQuery);
                     }
                     // TBD
                     // if (req.query.oweneroperator) {