From 44252fb69f1725c9d2c92c4f977b35cb36b69e53 Mon Sep 17 00:00:00 2001
From: David Gustafsson <david.gustafsson@ub.gu.se>
Date: Thu, 2 Nov 2017 15:02:23 +0100
Subject: [PATCH] Bug 19564: Fix extraction of sort order from sort condition
 name

Currently sort order is extracted from sort condition by splitting the
field, instead use regular expression to extract the last part preceded
by underscore.
---
 Koha/SearchEngine/Elasticsearch/QueryBuilder.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm b/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm
index cdd0fc6bd1..6612b52e15 100644
--- a/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm
+++ b/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm
@@ -490,7 +490,7 @@ sub _convert_sort_fields {
 
     # Convert the fields and orders, drop anything we don't know about.
     grep { $_->{field} } map {
-        my ( $f, $d ) = split /_/;
+        my ( $f, $d ) = /(.+)_(.+)/;
         {
             field     => $sort_field_convert{$f},
             direction => $sort_order_convert{$d}
-- 
2.11.0