Skip to content

Commit

Permalink
Device description and admin comments are no longer indexed by search…
Browse files Browse the repository at this point in the history
… bar; should alleviate wonky search results
  • Loading branch information
arc12012 committed Apr 22, 2017
1 parent 527cd32 commit 1f32fe9
Showing 1 changed file with 1 addition and 15 deletions.
16 changes: 1 addition & 15 deletions WebContent/html/webpages/administration/adminDeviceSettings.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -415,29 +415,15 @@ function fuzzyFilter(deviceArray)
for (var i = lockerFilterResults.length - 1; i >= 0; i--) {
lockerFilterResults[i].original.locker=lockerFilterResults[i].string;
}
////// Eight pass: filter by Admin Comments
options.extract = function(arg) {return arg.admincomment;};
var admincommentFilterResults = fuzzy.filter(searchText, deviceArray, options);
// replace releveant field with bolded string
for (var i = admincommentFilterResults.length - 1; i >= 0; i--) {
admincommentFilterResults[i].original.admincomment=admincommentFilterResults[i].string;
}
////// Ninth pass: filter by OS
options.extract = function(arg) {return arg.os;};
var osFilterResults = fuzzy.filter(searchText, deviceArray, options);
// replace releveant field with bolded string
for (var i = osFilterResults.length - 1; i >= 0; i--) {
osFilterResults[i].original.os=osFilterResults[i].string;
}
////// Tenth pass: filter by description
options.extract = function(arg) {return arg.description;};
var descriptionFilterResults = fuzzy.filter(searchText, deviceArray, options);
// replace releveant field with bolded string
for (var i = descriptionFilterResults.length - 1; i >= 0; i--) {
descriptionFilterResults[i].original.description=descriptionFilterResults[i].string;
}
var filteredResults = union([nameFilterResults,macFilterResults,manufacturerFilterResults,hardwareFilterResults,modelFilterResults,serialFilterResults,lockerFilterResults,admincommentFilterResults,osFilterResults,descriptionFilterResults]);
var filteredResults = union([nameFilterResults,macFilterResults,manufacturerFilterResults,hardwareFilterResults,modelFilterResults,serialFilterResults,lockerFilterResults,osFilterResults]);
// this returns a filtered array of objects with attributes 'index', 'original', 'score', and 'string'
// I am interested in the 'original' attribute, which is the relevant object exactly as it was submitted,
Expand Down

0 comments on commit 1f32fe9

Please sign in to comment.