From 8e13a20ccc01df2248f3b6ac3b7e76c06a0b7ca8 Mon Sep 17 00:00:00 2001
From: Jon Pentland <jon.pentland@pretagov.co.uk>
Date: Wed, 8 May 2024 10:57:50 +0100
Subject: [PATCH 1/3] Create string search operator

---
 plone/app/querystring/profiles/default/registry.xml | 8 ++++++++
 plone/app/querystring/querybuilder.py               | 5 ++++-
 plone/app/querystring/queryparser.py                | 3 +++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/plone/app/querystring/profiles/default/registry.xml b/plone/app/querystring/profiles/default/registry.xml
index 24b3873..004db5e 100644
--- a/plone/app/querystring/profiles/default/registry.xml
+++ b/plone/app/querystring/profiles/default/registry.xml
@@ -242,6 +242,14 @@
     <value key="operation">plone.app.querystring.queryparser._contains</value>
     <value key="widget">StringWidget</value>
   </records>
+  
+  <records interface="plone.app.querystring.interfaces.IQueryOperation"
+      prefix="plone.app.querystring.operation.string.search">
+      <value key="title" i18n:translate="">Search</value>
+      <value key="description"></value>
+      <value key="operation">plone.app.querystring.queryparser._search</value>
+      <value key="widget">StringWidget</value>
+  </records>
 
   <records interface="plone.app.querystring.interfaces.IQueryOperation"
            prefix="plone.app.querystring.operation.string.currentUser"
diff --git a/plone/app/querystring/querybuilder.py b/plone/app/querystring/querybuilder.py
index bd8978f..75ac0f9 100644
--- a/plone/app/querystring/querybuilder.py
+++ b/plone/app/querystring/querybuilder.py
@@ -261,9 +261,12 @@ def number_of_results(self, query):
 
     def filter_query(self, query):
         text = query.get("SearchableText", None)
+        munge = True
         if isinstance(text, dict):
+            if text.get("operator", "") == "search":
+                munge = False
             text = text.get("query", "")
-        if text:
+        if text and munge:
             query["SearchableText"] = self.munge_search_term(text)
         return query
 
diff --git a/plone/app/querystring/queryparser.py b/plone/app/querystring/queryparser.py
index 1f0a056..d587f47 100644
--- a/plone/app/querystring/queryparser.py
+++ b/plone/app/querystring/queryparser.py
@@ -110,6 +110,9 @@ def parseAndModifyFormquery(context, query, sort_on=None, sort_order=None):
 def _contains(context, row):
     return _equal(context, row)
 
+def _search(context, row):
+    return {row.index: {'query': row.values, 'operator': 'search' }}
+
 
 def _excludes(context, row):
     return {row.index: {"not": row.values}}

From 4a289a0dec8a69e31bc9fd758e2fd2983fdfb664 Mon Sep 17 00:00:00 2001
From: Jon Pentland <jon.pentland@pretagov.co.uk>
Date: Wed, 22 May 2024 09:57:50 +0100
Subject: [PATCH 2/3] Create registry entries and upgrade step

---
 plone/app/querystring/profiles.zcml           |  8 +++++++
 .../querystring/profiles/default/metadata.xml |  2 +-
 .../querystring/profiles/default/registry.xml |  1 +
 .../profiles/upgrades/to_15/registry.xml      | 23 +++++++++++++++++++
 plone/app/querystring/upgrades.zcml           | 10 ++++++++
 5 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 plone/app/querystring/profiles/upgrades/to_15/registry.xml

diff --git a/plone/app/querystring/profiles.zcml b/plone/app/querystring/profiles.zcml
index f042058..9964d90 100644
--- a/plone/app/querystring/profiles.zcml
+++ b/plone/app/querystring/profiles.zcml
@@ -90,4 +90,12 @@
       directory="profiles/upgrades/to_14"
       />
 
+  <genericsetup:registerProfile
+      name="upgrade_to_15"
+      title="Querystring Upgrade profile to v15"
+      description=""
+      provides="Products.GenericSetup.interfaces.EXTENSION"
+      directory="profiles/upgrades/to_15"
+      />
+
 </configure>
diff --git a/plone/app/querystring/profiles/default/metadata.xml b/plone/app/querystring/profiles/default/metadata.xml
index 3949c2a..c8b58bc 100644
--- a/plone/app/querystring/profiles/default/metadata.xml
+++ b/plone/app/querystring/profiles/default/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metadata>
-  <version>14</version>
+  <version>15</version>
   <dependencies>
     <dependency>profile-plone.app.registry:default</dependency>
   </dependencies>
diff --git a/plone/app/querystring/profiles/default/registry.xml b/plone/app/querystring/profiles/default/registry.xml
index 004db5e..a3dd76a 100644
--- a/plone/app/querystring/profiles/default/registry.xml
+++ b/plone/app/querystring/profiles/default/registry.xml
@@ -803,6 +803,7 @@
     <value key="sortable">False</value>
     <value key="operations">
       <element>plone.app.querystring.operation.string.contains</element>
+      <element>plone.app.querystring.operation.string.search</element>
     </value>
     <value key="group"
            i18n:translate=""
diff --git a/plone/app/querystring/profiles/upgrades/to_15/registry.xml b/plone/app/querystring/profiles/upgrades/to_15/registry.xml
new file mode 100644
index 0000000..f61f222
--- /dev/null
+++ b/plone/app/querystring/profiles/upgrades/to_15/registry.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<registry xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+          i18n:domain="plone"
+>
+  <records interface="plone.app.querystring.interfaces.IQueryOperation"
+      prefix="plone.app.querystring.operation.string.search">
+      <value key="title" i18n:translate="">Search</value>
+      <value key="description"></value>
+      <value key="operation">plone.app.querystring.queryparser._search</value>
+      <value key="widget">StringWidget</value>
+  </records>
+
+ <records interface="plone.app.querystring.interfaces.IQueryField"
+           prefix="plone.app.querystring.field.SearchableText"
+           purge="False"
+  >
+    <value key="operations"
+           purge="False"
+    >
+      <element>plone.app.querystring.operation.string.search</element>
+    </value>
+  </records>
+</registry>
diff --git a/plone/app/querystring/upgrades.zcml b/plone/app/querystring/upgrades.zcml
index 07c2e23..1763c03 100644
--- a/plone/app/querystring/upgrades.zcml
+++ b/plone/app/querystring/upgrades.zcml
@@ -157,6 +157,16 @@
         title="Add new 'string.isNot' and 'selection.none' query operators."
         import_profile="plone.app.querystring:upgrade_to_14"
         />
+ </genericsetup:upgradeSteps>
+   <genericsetup:upgradeSteps
+      profile="plone.app.querystring:default"
+      source="14"
+      destination="15"
+      >
+    <genericsetup:upgradeDepends
+        title="Add new 'string.search' query operator."
+        import_profile="plone.app.querystring:upgrade_to_15"
+        />
   </genericsetup:upgradeSteps>
 
 </configure>

From 94c386bf921b52244cb419bb218b13c5c1442db6 Mon Sep 17 00:00:00 2001
From: Jon Pentland <jon.pentland@pretagov.co.uk>
Date: Wed, 22 May 2024 10:03:04 +0100
Subject: [PATCH 3/3] Remove operator key from dict when used

---
 plone/app/querystring/querybuilder.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plone/app/querystring/querybuilder.py b/plone/app/querystring/querybuilder.py
index 75ac0f9..7401ca5 100644
--- a/plone/app/querystring/querybuilder.py
+++ b/plone/app/querystring/querybuilder.py
@@ -265,6 +265,8 @@ def filter_query(self, query):
         if isinstance(text, dict):
             if text.get("operator", "") == "search":
                 munge = False
+                # catalog searches don't accept the operator key so remove it
+                del text["operator"]
             text = text.get("query", "")
         if text and munge:
             query["SearchableText"] = self.munge_search_term(text)