From 3f48f11838e4b15c504be194644ff95dde32d875 Mon Sep 17 00:00:00 2001
From: James Collins <james.collins@outlook.com.au>
Date: Sun, 12 Mar 2023 13:50:51 +1000
Subject: [PATCH] support quotes and embed quotes in filter

---
 app/Conductors/Conductor.php | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/app/Conductors/Conductor.php b/app/Conductors/Conductor.php
index 05e475d..2a2379f 100644
--- a/app/Conductors/Conductor.php
+++ b/app/Conductors/Conductor.php
@@ -473,6 +473,30 @@ class Conductor
         }
 
         $tokens = preg_split('/([()]|,OR,|,AND,|,)/', $filterString, -1, (PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE));
+        $glued = [];
+        $glueToken = '';
+        foreach ($tokens as $item) {
+            if ($glueToken === '') {
+                if (preg_match('/(?<!\\\\)[\'"]/', $item, $matches, PREG_OFFSET_CAPTURE) === 1) {
+                    $glueToken = $matches[0][0];
+                    $item = substr($item, 0, $matches[0][1]) . substr($item, ($matches[0][1] + 1));
+                    $item = str_replace("\\$glueToken", $glueToken, $item);
+                }
+
+                $glued[] = $item;
+            } else {
+                // search for ending glue token
+                if (preg_match('/(?<!\\\\)' . $glueToken . '/', $item, $matches, PREG_OFFSET_CAPTURE) === 1) {
+                    $item = substr($item, 0, $matches[0][1]) . substr($item, ($matches[0][1] + 1));
+                    $glueToken = '';
+                }
+
+                $item = str_replace("\\$glueToken", $glueToken, $item);
+
+                $glued[(count($glued) - 1)] .= $item;
+            }
+        }//end foreach
+        $tokens = $glued;
 
         $parseTokens = function ($tokenList, $level, $index, $groupBoolean = null) use ($limitFields, &$parseTokens) {
             $tokenGroup = [];