Highlight & error handling improvements

Author: pdphilip

src/DSL/Bridge.php

@@ -1015,7 +1015,7 @@ private function _sanitizeSearchResponse($response, $params, $queryTag)
 
                 //Meta data
                 if (!empty($hit['highlight'])) {
-                    $datum['_meta']['highlights'] = $hit['highlight'];
+                    $datum['_meta']['highlights'] = $this->_sanitizeHighlights($hit['highlight']);
                 }
 
                 $datum['_meta']['_index'] = $hit['_index'];
@@ -1032,6 +1032,23 @@ private function _sanitizeSearchResponse($response, $params, $queryTag)
         return $this->_return($data, $meta, $params, $queryTag);
     }
 
+    private function _sanitizeHighlights($highlights)
+    {
+        //remove keyword results
+        foreach ($highlights as $field => $vals) {
+            if (str_contains($field, '.keyword')) {
+                $cleanField = str_replace('.keyword', '', $field);
+                if (isset($highlights[$cleanField])) {
+                    unset($highlights[$field]);
+                } else {
+                    $highlights[$cleanField] = $vals;
+                }
+            }
+        }
+        
+        return $highlights;
+    }
+    
     private function _sanitizeAggsResponse($response, $params, $queryTag)
     {
         $meta['timed_out'] = $response['timed_out'];

src/DSL/Results.php

@@ -42,10 +42,11 @@ private function _decodeError($error)
         $return['msg'] = $error;
         $return['data'] = [];
         $jsonStartPos = strpos($error, ': ') + 2;
-        $response = stripslashes($error);
+        $response = ($error);
         $title = substr($response, 0, $jsonStartPos);
         $jsonString = substr($response, $jsonStartPos);
         $errorArray = json_decode($jsonString, true);
+        
         if (json_last_error() === JSON_ERROR_NONE) {
             $errorReason = $errorArray['error']['reason'] ?? null;
             if (!$errorReason) {