ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-21 03:55:31 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

[Search] More generalized restrictions

Browse Source 
Moved the EverythingSearchProvider's term to item
matching to new functions, so that they can be
more easily modified later.
This commit is contained in:
shale 2015-07-16 16:50:07 -07:00
parent c1ebd50e4c
commit cf3169dd68
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/features/search/src/controllers/SearchController.js
View File

@ -29,7 +29,7 @@ define(function () {
function SearchController($scope, searchService, objectService) {
$scope.pageLength = 4;
$scope.pageLength = 16;
function page(start, howMany) {
if (!howMany) {

27
platform/features/search/src/providers/EverythingSearchProvider.js
View File

@ -97,20 +97,33 @@ define(
return score;
}
// Determines if this item can be a valid result for this search term
function validResult(item, term) {
var itemModel = item.object.getModel(),
itemName = itemModel.name.toLocaleLowerCase(),
itemType = itemModel.type.toLocaleLowerCase();
return itemName.includes(term) || itemType.includes(term);
}
// Determines if this item is a valid type for a search result
function validType(item) {
var itemModel = item.object.getModel();
// Only folders are disallowed
return itemModel.type !== "folder";
}
// Filter through a list of searchResults based on a search term
function filterResults(results, term, resultsLength) {
var searchResults = [],
itemModel,
itemName;
itemModel;
for (var i = 0; i < resultsLength; i += 1) {
// Prevent errors from getModel not being defined
if (results[i].object.getModel) {
itemModel = results[i].object.getModel();
itemName = itemModel.name.toLocaleLowerCase();
// Include any matching items, except folders
if (itemName.includes(term) && itemModel.type !== "folder") {
// Include any items that match the term and are of valid type
if (validResult(results[i], term) && validType(results[i])) {
// Score the result
score(results[i], term);
// Add the result to the result list