Commit 321a0ea6 by Andy Armstrong

Fix searching with Chinese characters

TNL-3228
parent 72ea41f9
...@@ -48,9 +48,9 @@ class CourseTeamIndexer(object): ...@@ -48,9 +48,9 @@ class CourseTeamIndexer(object):
""" """
# Always use the English version of any localizable strings (see TNL-3239) # Always use the English version of any localizable strings (see TNL-3239)
with translation.override('en'): with translation.override('en'):
return "{name}\n{description}\n{country}\n{language}".format( return u"{name}\n{description}\n{country}\n{language}".format(
name=self.course_team.name.encode('utf-8'), name=self.course_team.name,
description=self.course_team.description.encode('utf-8'), description=self.course_team.description,
country=self.course_team.country.name.format(), country=self.course_team.country.name.format(),
language=self._language_name() language=self._language_name()
) )
......
...@@ -224,6 +224,14 @@ class TeamAPITestCase(APITestCase, SharedModuleStoreTestCase): ...@@ -224,6 +224,14 @@ class TeamAPITestCase(APITestCase, SharedModuleStoreTestCase):
course_id=self.test_course_2.id, course_id=self.test_course_2.id,
topic_id='topic_7' topic_id='topic_7'
) )
self.chinese_team = CourseTeamFactory.create(
name=u'著文企臺個',
description=u'共樣地面較,件展冷不護者這與民教過住意,國制銀產物助音是勢一友',
country='CN',
language='zh_HANS',
course_id=self.test_course_2.id,
topic_id='topic_7'
)
self.test_team_name_id_map = {team.name: team for team in ( self.test_team_name_id_map = {team.name: team for team in (
self.solar_team, self.solar_team,
...@@ -232,6 +240,7 @@ class TeamAPITestCase(APITestCase, SharedModuleStoreTestCase): ...@@ -232,6 +240,7 @@ class TeamAPITestCase(APITestCase, SharedModuleStoreTestCase):
self.another_team, self.another_team,
self.public_profile_team, self.public_profile_team,
self.search_team, self.search_team,
self.chinese_team,
)} )}
for user, course in [('staff', self.test_course_1), ('course_staff', self.test_course_1)]: for user, course in [('staff', self.test_course_1), ('course_staff', self.test_course_1)]:
...@@ -438,7 +447,7 @@ class TestListTeamsAPI(EventTestMixin, TeamAPITestCase): ...@@ -438,7 +447,7 @@ class TestListTeamsAPI(EventTestMixin, TeamAPITestCase):
self.verify_names( self.verify_names(
{'course_id': self.test_course_2.id}, {'course_id': self.test_course_2.id},
200, 200,
['Another Team', 'Public Profile Team', 'Search'], ['Another Team', 'Public Profile Team', 'Search', u'著文企臺個'],
user='staff' user='staff'
) )
...@@ -517,6 +526,7 @@ class TestListTeamsAPI(EventTestMixin, TeamAPITestCase): ...@@ -517,6 +526,7 @@ class TestListTeamsAPI(EventTestMixin, TeamAPITestCase):
('Island', ['Search']), ('Island', ['Search']),
('not-a-query', []), ('not-a-query', []),
('team', ['Another Team', 'Public Profile Team']), ('team', ['Another Team', 'Public Profile Team']),
(u'著文企臺個', [u'著文企臺個']),
) )
@ddt.unpack @ddt.unpack
def test_text_search(self, text_search, expected_team_names): def test_text_search(self, text_search, expected_team_names):
......
...@@ -333,7 +333,7 @@ class TeamsListView(ExpandableFieldViewMixin, GenericAPIView): ...@@ -333,7 +333,7 @@ class TeamsListView(ExpandableFieldViewMixin, GenericAPIView):
result_filter.update({'course_id': course_id_string}) result_filter.update({'course_id': course_id_string})
search_results = search_engine.search( search_results = search_engine.search(
query_string=text_search.encode('utf-8'), query_string=text_search,
field_dictionary=result_filter, field_dictionary=result_filter,
size=MAXIMUM_SEARCH_SIZE, size=MAXIMUM_SEARCH_SIZE,
) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment