ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-01 15:10:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Search] Partway works

Browse Source 
The search function now returns actual
objects are results. They may not be the
correct results though.
This commit is contained in:
shale 2015-07-14 09:36:58 -07:00
parent 89d0ea6506
commit 07e08c283a
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
platform/features/search/src/SearchController.js
View File

@ -34,6 +34,7 @@ define(function () {
function SearchController($scope, $http, objectService, queryService, ROOT) { function SearchController($scope, $http, objectService, queryService, ROOT) {
/*
// Search through items for items which contain the search term in the name // Search through items for items which contain the search term in the name
function search() { function search() {
var term, var term,
@ -63,7 +64,7 @@ define(function () {
// Include any matching items, except folders // Include any matching items, except folders
// TODO: Should have a policy for this // TODO: Should have a policy for this
if (itemName.includes(term) && itemModel.type !== 'folder') { if (itemName.includes(term) && itemModel.type !== "folder") {
searchResults.push(items[i]); searchResults.push(items[i]);
} }
} }
@ -73,12 +74,13 @@ define(function () {
return searchResults; return searchResults;
}); });
} }
*/
function search2() { function search2() {
var term = document.getElementById("searchinput").value; var term = document.getElementById("searchinput").value;
// Get the data... // Get the data...
$scope.results = $http({ return $http({
method: "GET", method: "GET",
url: ROOT + "/_search", url: ROOT + "/_search",
data: { data: {
@ -92,39 +94,37 @@ define(function () {
// ...then process the data // ...then process the data
var results = rawResults.data.hits.hits, var results = rawResults.data.hits.hits,
resultsLength = results.length, resultsLength = results.length,
output = [], ids = [],
id,
i; i;
console.log('raw', rawResults); // Get the result objects' IDs
console.log('results, pre', results);
for (i = 0; i < resultsLength; i++) { for (i = 0; i < resultsLength; i++) {
// Get the object's ID ids.push(results[i][ID]);
results[i] = results[i][ID];
console.log('results [', i, '] (id)', results[i]);
// Get the object itself from its ID
objectService.getObjects([ results[i] ]).then(function (obj) {
// Manually get the member name to get to the actual object
for (var prop in obj) {
console.log('prop [', i, ']', obj[prop]);
output.push(obj[prop]);
debugger;
}
});
console.log('results [', i, '] (id)', results[i]);
console.log('output [', i, '] (obj)', output[i]);
} }
console.log('results, post', results);
console.log('output, post', output);
return output; // Get the objects themselves from their IDs
return objectService.getObjects(ids).then(function (objects) {
var output = [],
id,
j;
for (j = 0; j < resultsLength; j++) {
id = ids[j];
output.push(objects[id]);
}
console.log('final output', output);
return output;
});
}); });
} }
return { return {
search: search2, search: function () {
search2().then( function (c) {
$scope.results = c;
});
},
// Check to see if there are any search results to display. // Check to see if there are any search results to display.
areResults: function () { areResults: function () {