Skip to content

Commit

Permalink
[hotfix] use baseline search (#1054)
Browse files Browse the repository at this point in the history
* [hotfix] use baseline search

* removed in-so-far invalid test
  • Loading branch information
alexahn917 authored and noahpresler committed Oct 29, 2017
1 parent 889f649 commit e67d31c
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
8 changes: 4 additions & 4 deletions searches/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ def test_no_course_exists(self):
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(len(response.data), 0)

def test_description_exist(self):
response = self.client.get('/search/Winter/1995/awesome/', **self.request_headers)
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertNotEqual(len(response.data), 0)
# def test_description_exist(self):
# response = self.client.get('/search/Winter/1995/awesome/', **self.request_headers)
# self.assertEqual(response.status_code, status.HTTP_200_OK)
# self.assertNotEqual(len(response.data), 0)


class AdvancedSearchTest(APITestCase):
Expand Down
10 changes: 6 additions & 4 deletions searches/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,13 @@ def get(self, request, query, sem_name, year):
""" Return vectorized search results. """
school = request.subdomain
sem = Semester.objects.get_or_create(name=sem_name, year=year)[0]
# TODO: use vectorized search after completion.
# Use vectorized_search if and only if a valid Searcher object is created, otherwise use baseline_search
if apps.get_app_config('searches').searcher:
course_match_objs = apps.get_app_config('searches').searcher.vectorized_search(request.subdomain, query, sem)[:4]
else:
course_match_objs = baseline_search(request.subdomain, query, sem)[:4]
# if apps.get_app_config('searches').searcher:
# course_match_objs = apps.get_app_config('searches').searcher.vectorized_search(request.subdomain, query, sem)[:4]
# else:
# course_match_objs = baseline_search(request.subdomain, query, sem)[:4]
course_match_objs = baseline_search(request.subdomain, query, sem)[:4]
save_analytics_course_search(query[:200], course_match_objs[:2], sem, request.subdomain,
get_student(request))
course_matches = [CourseSerializer(course, context={'semester': sem, 'school': school}).data
Expand Down

0 comments on commit e67d31c

Please sign in to comment.