ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-02-10 12:51:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Search] Worker presorts search results

Browse Source 
Changed the generic search worker to sort
the search results before truncating the
results list to match maxResults. #91.
This commit is contained in:
slhale 2015-08-28 15:12:06 -07:00
parent 9593855c3f
commit a55607dc23
2 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
platform/search/src/services/GenericSearchProvider.js
View File

@ -79,27 +79,28 @@ define(
// Handles responses from the web worker. Namely, the results of
// a search request.
function handleResponse(event) {
var ids = [],
id;
var ids = [];
// If we have the results from a search
if (event.data.request === 'search') {
// Convert the ids given from the web worker into domain objects
for (id in event.data.results) {
ids.push(id);
}
// Get the ids into an array
event.data.results.forEach(function (result) {
ids.push(result.id);
});
// Get domainObjects with the ids
objectService.getObjects(ids).then(function (objects) {
var searchResults = [],
id;
var searchResults = [];
// Create searchResult objects
for (id in objects) {
// Create searchResult objects with the gotten domainObjects
event.data.results.forEach(function (result) {
searchResults.push({
object: objects[id],
id: id,
score: event.data.results[id]
object: objects[result.id],
id: result.id,
score: result.score
});
}
});
// Resove the promise corresponding to this
pendingQueries[event.data.timestamp].resolve({

32
platform/search/src/services/GenericSearchWorker.js
View File

@ -93,14 +93,14 @@
* * timestamp: The time identifier from when the query was made
*/
function search(data) {
// This results dictionary will have domain object ID keys which
// point to the value the domain object's score.
var results = {},
// This results array will have domain object IDs and scores together
// [{score: number, id: string}]
var results = [],
input = data.input.toLocaleLowerCase(),
terms = convertToTerms(input),
message = {
request: 'search',
results: {},
results: [],
total: 0,
timestamp: data.timestamp,
timedOut: false
@ -111,6 +111,7 @@
// If the user input is empty, we want to have no search results.
if (input !== '') {
// Start getting search results
for (i = 0; i < indexedItems.length; i += 1) {
// If this is taking too long, then stop
if (Date.now() > data.timestamp + data.timeout) {
@ -121,23 +122,26 @@
// Score and add items
score = scoreItem(indexedItems[i], input, terms);
if (score > 0) {
results[indexedItems[i].id] = score;
results.push({id: indexedItems[i].id, score: score});
message.total += 1;
}
}
}
// Sort the results by score
results.sort(function (a, b) {
if (a.score > b.score) {
return -1;
} else if (b.score > a.score) {
return 1;
} else {
return 0;
}
});
// Truncate results if there are more than maxResults
if (message.total > data.maxResults) {
i = 0;
for (id in results) {
message.results[id] = results[id];
i += 1;
if (i >= data.maxResults) {
break;
}
}
// TODO: This seems inefficient.
message.results = results.slice(0, data.maxResults);
} else {
message.results = results;
}