ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-02-07 11:30:28 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

[Search] Input checks

Browse Source 
More checks to see if the input is empty
before doing search computations.
This commit is contained in:
slhale 2015-08-11 13:52:23 -07:00
parent 7cad3ba0bc
commit 48693df51f
2 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/persistence/elastic/src/ElasticsearchSearchProvider.js
View File

@ -149,7 +149,7 @@ define(
} }
// If the user input is empty, we want to have no search results. // If the user input is empty, we want to have no search results.
if (searchTerm !== '') { if (searchTerm !== '' && searchTerm !== undefined) {
// Process the search term // Process the search term
searchTerm = processSearchTerm(searchTerm); searchTerm = processSearchTerm(searchTerm);

39
platform/search/src/GenericSearchProvider.js
View File

@ -191,24 +191,31 @@ define(
searchResults = [], searchResults = [],
defer = $q.defer(); defer = $q.defer();
// Allow us to access this promise later to resolve it later // If the input is nonempty, do a search
pendingQueries[timestamp] = defer; if (input !== '' && input !== undefined) {
// Allow us to access this promise later to resolve it later
pendingQueries[timestamp] = defer;
// Check to see if the user provided a maximum // Check to see if the user provided a maximum
// number of results to display // number of results to display
if (!maxResults) { if (!maxResults) {
// Else, we provide a default value // Else, we provide a default value
maxResults = DEFAULT_MAX_RESULTS; maxResults = DEFAULT_MAX_RESULTS;
}
// Similarly, check if timeout was provided
if (!timeout) {
timeout = DEFAULT_TIMEOUT;
}
// Send the query to the worker
workerSearch(input, maxResults, timestamp, timeout);
return defer.promise;
} else {
// Otherwise return an empty result
return {hits: [], total: 0};
} }
// Similarly, check if timeout was provided
if (!timeout) {
timeout = DEFAULT_TIMEOUT;
}
// Send the query to the worker
workerSearch(input, maxResults, timestamp, timeout);
return defer.promise;
} }
// Index the tree's contents once at the beginning // Index the tree's contents once at the beginning