Commit Graph

1429 Commits

Author SHA1 Message Date
7934e8d425 [Search] Changed worker result implementation
The interface remains the same, but the web worker
returns a pseudo dictionary (actually an object)
after being told the search. The key value pairs
for this dictionary are ids and scores.
2015-07-21 14:55:44 -07:00
cb56bbe569 [Documentation] Fix JSDoc syntax errors 2015-07-21 14:30:00 -07:00
5a93e5a2bc [Search] Correct search updating
The search controller now updates the display
results list, then repeatedly asks the
aggregator to update until the timestamps
all are at least as new as the one that the
controller originally gave for the query.
Basically, the search now updates correctly
without having to press enter again.
2015-07-21 14:24:37 -07:00
41c38f202d [Search] Comments
Removed extra commented out code.
2015-07-21 13:04:03 -07:00
f0f396f656 [Search] Needs more updating
The search aggregator now correctly gets
from the providers, but because of not
sync, the display is effectively one press
behind the correct search results.
Still, working to some extent.
2015-07-21 12:59:52 -07:00
a5febf8f0f [Search] Removed paging
Removed the paging from the search view,
because later instead of paging there will
be a 'view more' option.
Also made the generic search provider
return searchResult objects instead of
raw domain objects.
2015-07-21 12:44:14 -07:00
4f4af87285 [Search] Added timestamp to queries
(Temporariliy removed the elasticsearch provider
from bundle.json)
Added a timestamp parameter to the query so that
the aggregator can tell when the results were last
updated. Created a separate function for getting
the results list. GenericSearch now converts back
from models to domain objects after the web worker
does its work.
2015-07-21 12:34:08 -07:00
1b5fbccc06 [Search] Removed validType function
Removed the validType function which previously
was a paraemter to the search providers. It
was no longer used, and is not necissary.
2015-07-21 11:17:45 -07:00
fc123cd367 [Search] In progress webworker
Connecting GenericSearch to the web worker is still
in progress. The aggregator currently gets the
results before the web worker is finished. In process
of fixing sync issue.
2015-07-21 11:14:13 -07:00
a0f4b98eed [Search] Webworker search
The web worker's search() appears to work. Now
we just need to link it in to the GenericSearch
as the primary means of searching.
2015-07-21 10:35:33 -07:00
7adcfc221a [Serach] Webworker indexes items
The indexItem() part of the web worker seems
to be working at this point.
2015-07-21 10:10:34 -07:00
c1dcd8ea5b [Search] Framework of webworker implementation
Made a basic outline of the desired web worker
implementation. (Functions present, now need to
implement them.)
2015-07-21 09:58:19 -07:00
74961e1106 [Search] Starting on workers
Starting to work on using web workers to
do some of the work of GenericSearch.
Changed bundle.json accordingly.
2015-07-21 09:44:14 -07:00
c79d1f2648 [Search] Choose higher score & optional parameters
Changed the search aggregator's filterRepeats
function to choose the version of the searchResult
object that has the higher score, when it
encounters multiple searchResult objects
corresponding to a domain object ID.
Also changed the search providers and aggregator
such that the validType parameter is now optional,
with a function that always returns true as the
defualt.
2015-07-21 09:41:52 -07:00
f4bd7d7a44 [Search] Revert to earlier commit
Reverted to before implementing next(). May re add
back some changes, such as removing validType and
then adding web workers.
2015-07-20 17:02:08 -07:00
1891b24bde [Search] Dump before revert
Commtting changes so far before revering
to a previous commit. Most changes to make
next() have been unneccsiary. We no longer
want next().
2015-07-20 16:56:39 -07:00
5520037908 [Search] Partial loading
Changed the providers to return only the first
search result. Each searchResult object has a
function next() which returns the next search
result. This allows the search aggregator to
load more results without making a whole new
search query. (Still requuires some cleaning
up.)
2015-07-20 14:30:22 -07:00
c0c0371451 [Search] Timeout passed from SearchAggregator
The timeout value is now an optional
parameter of the providers, and
the search aggregator now passes a
common default value to all of them.
2015-07-20 11:21:55 -07:00
ed956d351d [Search] Elasticsearch timeout
Added a term to the elasticsearch query
that should make it time out. Apparently
this only works sometimes, as ES uses a
'best effort' timeout.
2015-07-20 11:08:43 -07:00
e9e9ca146b [Search] Generic search timeout
Added a time limit for generic search's indexing
of the filetree, at which point it will just
return the portion of the filetree it has
indexed.
Additioanlly attempted to move this part of
the functionality to a webworker, but is not
working because of unclonability of the
objects. (Commented out)
Also updated some documentation comments.
2015-07-20 10:59:02 -07:00
e8b662571b [Search] Not case sensitive
Made sure that generic search's matching is
not case sensitive.
2015-07-17 14:06:48 -07:00
2a784115d5 Merge branch 'master' of https://github.com/nasa/openmctweb into search 2015-07-17 13:49:19 -07:00
9f5f14826b [Search] Changed generic's matching implementation
Changed how the generic search provider determines
search matches. It now splits the search input into
search terms by spliting at spaces, and then scores
the results by how many of the terms appear as
substrings in the result.
2015-07-17 13:49:09 -07:00
c75d94289b [Serach] Callbacks and renaming
Added validType() as a callback parameter to the search
providers. It is defined in the search aggregator, and
is used to put any restrictions on object type in the
displayed search results.
Renamed EverythingSearchProvider to GenericSearchProvider.
2015-07-17 11:26:44 -07:00
2e2e7ee876 Merge branch 'open1444b' into open-master 2015-07-17 11:05:25 -07:00
affd5f8d29 Merge branch 'open1426' into open-master 2015-07-17 10:56:09 -07:00
492dbcbc51 [Search] Comments and keypress
Changed the controller for the search input
to respond on keypress rather than keyup.
Added comments better explaining searchResult
objects to the search aggregator.
2015-07-17 09:33:10 -07:00
deed95d8d1 [Plot] Don't allocate charts for empty plots
Don't allocate WebGL charts for empty plots, WTD-1444.
2015-07-17 09:13:20 -07:00
c82163fa7b [Search] Comments and style 2015-07-16 16:54:53 -07:00
cf3169dd68 [Search] More generalized restrictions
Moved the EverythingSearchProvider's term to item
matching to new functions, so that they can be
more easily modified later.
2015-07-16 16:50:11 -07:00
c1ebd50e4c [Search] Result paging
The search view now can page the
results when there are many.
2015-07-16 16:31:54 -07:00
442a1979e7 [Search] Rudimentary scroing for manual
Created a rudimentary scoring function for
the EverythingSearchProvider. Also corrected
the sorting by score function.
2015-07-16 14:36:02 -07:00
922a724e36 [Search] Removed unused file
Removed SearchService.js, as now the searchService
is implemented using the aggregator and providers.
2015-07-16 13:26:23 -07:00
15a9d2380c [Search] Removed unnecissary dependency
Removed an unnecissary parameter from the
search aggregator ($q).
2015-07-16 13:11:00 -07:00
80e0bd875a [Search] Aggregator merges results
The search aggregator now merges search
results from different providers better.
It removed duplicate results, and orders
the list of results from highest to
lowest score.
2015-07-16 13:08:05 -07:00
bc2072b8c6 [Search] Removed unused search provider
WARP search provider should not be
implemented here. And was not yet
implemented or used at all anyway.
2015-07-16 11:33:36 -07:00
25208a9074 [Search] Aggregator aggregates
The search aggregator now combines the search
results from each search provider and returns
that. Objects may appear in the list more
than once.
2015-07-16 11:31:30 -07:00
cd3c2312a5 [Search] Basic aggregator works
The search view now behaves as it
previously did. The search aggregator
is set to just use ElasticSearch, but
it works.
2015-07-16 10:35:26 -07:00
6f2ad0dadc [Search] Renaming and adding files
Renamed QueryService as SearchService and changed
the corresponding references to it. Added a
SearchAggregator file and related files. Not
yet begun with the implementation.
2015-07-16 10:10:07 -07:00
1e05ebbfd7 [Search] Modified default input funct
Renamed isDefaultInput() to isDefaultFormat(). It
currently just checks for 'name' or 'type' tags,
but it may be completely unneeded.
2015-07-16 09:56:55 -07:00
c5c3546b92 [Search] Relaxed quote rules
Allowed quotes more often in search terms.
When there are quotes, that space-separated
term will not get the fuzzy identifier.
2015-07-15 17:02:51 -07:00
672fa74321 [Search] Changed default max results
Changed the default number of max results to
be 100 results.
2015-07-15 16:46:38 -07:00
3fcf061679 Merge branch 'master' of https://github.com/nasa/openmctweb into search-explore 2015-07-15 16:15:25 -07:00
e400f211c4 Merge remote-tracking branch 'nasa/open1404' into open1427
Merge in preparation for review/integration, WTD-1427

Conflicts:
	platform/commonUI/general/res/templates/containers/accordion.html
2015-07-15 13:45:37 -07:00
b94ef695e2 [Search] Creating searchbar
Starting to create a search bar which lives
in the same side of the divder as the file
tree does.
2015-07-15 13:29:45 -07:00
759eaa3b35 [Search] Comments 2015-07-15 12:39:22 -07:00
eee9309650 [Search] Fuzziness operator
Insead of wildcards, adding the fuzziness
operator to searches to ensure completeness
of the search results.
2015-07-15 12:14:30 -07:00
e634d77a8e [Search] Add wildcards
Added wildcards to most searches at the
front and end of each word that is separated
by spaces.
2015-07-15 11:39:02 -07:00
06b26b799e [Search] Comments 2015-07-15 11:10:04 -07:00
d6720884f1 [Search] Elasticsearch search options
Changed the search term processor to allow
the name and type options again (for
elasticsearch).
2015-07-15 10:52:27 -07:00