diff --git a/VERSIONS_HOTLINE/146510 b/VERSIONS_HOTLINE/146510 new file mode 100644 index 0000000000000000000000000000000000000000..1aa3cb4a19c39afc35d67c92ac5dd123aa68767d --- /dev/null +++ b/VERSIONS_HOTLINE/146510 @@ -0,0 +1 @@ + - ticket #146510 : Autocompletion : limitation du temps maximum de réponse à 1s \ No newline at end of file diff --git a/library/Class/Autocomplete/IndexSearcher.php b/library/Class/Autocomplete/IndexSearcher.php index 4bdb0e1ea7c9cfcaa52f07bf6c3ea899ea257d2f..69644a238706303145dbd117f3272d4f3e6448e3 100644 --- a/library/Class/Autocomplete/IndexSearcher.php +++ b/library/Class/Autocomplete/IndexSearcher.php @@ -68,7 +68,7 @@ class Class_Autocomplete_IndexSearcher { $grep_args []= "-i -E '(\b|'\'')" . $term . "'"; $grep_args[] = "-m 10 ".array_pop($grep_args); - return 'grep '.implode(' | grep ', $grep_args); + return 'timeout 1s grep '.implode(' | grep ', $grep_args); } diff --git a/tests/eco/BokehEngineEcoTest.php b/tests/eco/BokehEngineEcoTest.php index 35c8c8471271f93e43b1e66f378ca6efac1093ba..5be8e01fdf2c6e1213784af3fceb75602fcb0e91 100644 --- a/tests/eco/BokehEngineEcoTest.php +++ b/tests/eco/BokehEngineEcoTest.php @@ -138,7 +138,7 @@ class BokehEcoSuggestAjaxActionTest extends BokehEngineEcoTestCase { /** @test */ public function grepCommandForIleMaiteShouldRestrictLastResultToTen() { $this->assertEquals( - "grep -riI -E --no-filename '(\b|'\'')M[aà áâãäå][iìÃîï]t[eèéêë][eèéêë]' | sort -Vuf | grep -i -E '(\b|'\'')l'\''[iìÃîï]l[eèéêë]' | grep -i -E '(\b|'\'')[iìÃîï]l[eèéêë]' | grep -m 10 -i -E '(\b|'\'')d[eèéêë]'", + "timeout 1s grep -riI -E --no-filename '(\b|'\'')M[aà áâãäå][iìÃîï]t[eèéêë][eèéêë]' | sort -Vuf | grep -i -E '(\b|'\'')l'\''[iìÃîï]l[eèéêë]' | grep -i -E '(\b|'\'')[iìÃîï]l[eèéêë]' | grep -m 10 -i -E '(\b|'\'')d[eèéêë]'", (new Class_Autocomplete_IndexSearcher)->buildGrepCommand("l'ile dE Maitee")); }