From 98911772b74d7750710423f4eb6b0609c9491e6e Mon Sep 17 00:00:00 2001 From: Sandeep Date: Thu, 1 Mar 2018 09:20:57 +0400 Subject: [PATCH] PHRAS-1873 PORT PHRAS-1685 dump esquery --- .../Controller/Prod/QueryController.php | 26 +++++++++---------- templates/web/prod/results/infos.html.twig | 19 ++++++++++++++ 2 files changed, 31 insertions(+), 14 deletions(-) create mode 100644 templates/web/prod/results/infos.html.twig diff --git a/lib/Alchemy/Phrasea/Controller/Prod/QueryController.php b/lib/Alchemy/Phrasea/Controller/Prod/QueryController.php index d1fd6db115..0b89522adb 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/QueryController.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/QueryController.php @@ -178,6 +178,8 @@ class QueryController extends Controller $page = $result->getCurrentPage($perPage); + $queryESLib = $result->getQueryESLib(); + $string = ''; if ($npages > 1) { @@ -230,19 +232,15 @@ class QueryController extends Controller } $string .= '
'; - $explain = "
"; - - $explain .= ""; - - if ($result->getTotal() != $result->getAvailable()) { - $explain .= $this->app->trans('reponses:: %available% Resultats rappatries sur un total de %total% trouves', ['available' => $result->getAvailable(), '%total%' => $result->getTotal()]); - } else { - $explain .= $this->app->trans('reponses:: %total% Resultats', ['%total%' => $result->getTotal()]); - } - - $explain .= " "; - $explain .= '
' . ($result->getDuration() / 1000) . ' s
dans index ' . $result->getIndexes(); - $explain .= "
"; + $explain = $this->render( + "prod/results/infos.html.twig", + [ + 'results'=> $result, + 'esquery' => $this->getAclForUser()->is_admin() ? + json_encode($queryESLib['body'], JSON_PRETTY_PRINT | JSON_HEX_TAG | JSON_HEX_QUOT | JSON_UNESCAPED_SLASHES) : + null + ] + ); $infoResult = '
' . $this->app->trans('%number% documents
selectionnes', ['%number%' => '']) @@ -354,7 +352,7 @@ class QueryController extends Controller $json['form'] = $options->serialize(); $json['queryCompiled'] = $result->getQueryCompiled(); $json['queryAST'] = $result->getQueryAST(); - $json['queryESLib'] = $result->getQueryESLib(); + $json['queryESLib'] = $queryESLib; } catch(\Exception $e) { // we'd like a message from the parser so get all the exceptions messages diff --git a/templates/web/prod/results/infos.html.twig b/templates/web/prod/results/infos.html.twig new file mode 100644 index 0000000000..c3416418cb --- /dev/null +++ b/templates/web/prod/results/infos.html.twig @@ -0,0 +1,19 @@ +
+ + + + {% set total = results.getTotal() %} + {% trans %}reponses:: %total% Resultats{% endtrans %} + + +
+
+ {{ results.getDuration() / 1000 }} s +
+ dans index {{ results.getIndexes() }} + {% if not(esquery is null) %} +
+
{{ esquery }}
+
+ {% endif %} +
\ No newline at end of file