plone.app.querystring 3.0.0a2__tar.gz → 3.0.0a3__tar.gz

{plone_app_querystring-3.0.0a2 → plone_app_querystring-3.0.0a3}/CHANGES.rst

@@ -8,6 +8,26 @@ Changelog
 
 .. towncrier release notes start
 
+3.0.0a3 (2026-03-30)
+--------------------
+
+Bug fixes:
+
+
+- Fix multi-word search so all word parts get wildcard prefix matching, not just the last one.
+  Use ``munge_search_term`` from ``plone.base.utils``, deprecate old import path.
+  @jensens (#4205)
+
+
+Internal:
+
+
+- Remove Subject index modifier — a Python 2 leftover that was already a no-op.
+  @jensens (#155)
+- Update configuration files.
+  [plone devs]
+
+
 3.0.0a2 (2025-11-26)
 --------------------
 

{plone_app_querystring-3.0.0a2/src/plone.app.querystring.egg-info → plone_app_querystring-3.0.0a3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plone.app.querystring
-Version: 3.0.0a2
+Version: 3.0.0a3
 Summary: A queryparser, querybuilder and extra helper tools, to parse stored queries to actual results, used in new style Plone collections
 Home-page: https://github.com/plone/plone.app.querystring
 Author: Plone Foundation
@@ -88,6 +88,26 @@ Changelog
 
 .. towncrier release notes start
 
+3.0.0a3 (2026-03-30)
+--------------------
+
+Bug fixes:
+
+
+- Fix multi-word search so all word parts get wildcard prefix matching, not just the last one.
+  Use ``munge_search_term`` from ``plone.base.utils``, deprecate old import path.
+  @jensens (#4205)
+
+
+Internal:
+
+
+- Remove Subject index modifier — a Python 2 leftover that was already a no-op.
+  @jensens (#155)
+- Update configuration files.
+  [plone devs]
+
+
 3.0.0a2 (2025-11-26)
 --------------------
 

{plone_app_querystring-3.0.0a2 → plone_app_querystring-3.0.0a3}/pyproject.toml

@@ -2,7 +2,7 @@
 # https://github.com/plone/meta/tree/main/src/plone/meta/default
 # See the inline comments on how to expand/tweak this configuration file
 [build-system]
-requires = ["setuptools>=68.2,<80", "wheel"]
+requires = ["setuptools>=68.2,<83", "wheel"]
 
 [tool.towncrier]
 directory = "news/"
@@ -60,7 +60,7 @@ profile = "plone"
 ##
 
 [tool.black]
-target-version = ["py38"]
+target-version = ["py310"]
 
 ##
 # Add extra configuration options in .meta.toml:

{plone_app_querystring-3.0.0a2 → plone_app_querystring-3.0.0a3}/setup.py

@@ -1,7 +1,6 @@
 from setuptools import setup
 
-
-version = "3.0.0a2"
+version = "3.0.0a3"
 
 long_description = open("README.rst").read() + "\n"
 long_description += open("CHANGES.rst").read()

{plone_app_querystring-3.0.0a2 → plone_app_querystring-3.0.0a3}/src/plone/app/querystring/indexmodifiers/configure.zcml

@@ -3,11 +3,6 @@
     i18n_domain="plone"
     >
 
-  <utility
-      factory=".query_index_modifiers.Subject"
-      provides="..interfaces.IParsedQueryIndexModifier"
-      name="Subject"
-      />
   <utility
       factory=".query_index_modifiers.Date"
       provides="..interfaces.IParsedQueryIndexModifier"

plone_app_querystring-3.0.0a3/src/plone/app/querystring/indexmodifiers/query_index_modifiers.py

@@ -0,0 +1,62 @@
+from dateutil.parser import parse
+from plone.app.querystring.interfaces import IParsedQueryIndexModifier
+from zope.interface import implementer
+
+
+@implementer(IParsedQueryIndexModifier)
+class base:
+    """DateIndex query modifier
+    see Products.PluginIndexes.DateIndex.DateIndex.DateIndex._convert function
+    """
+
+    def __call__(self, value):
+        def _normalize(val):
+            """Encode value, parse dates."""
+
+            if isinstance(val, str):
+                try:
+                    val = parse(val)
+                except (ValueError, AttributeError):
+                    pass
+
+            return val
+
+        query = value["query"]
+        query = _normalize(query)
+
+        if isinstance(query, list):
+            aux = list()
+            for item in query:
+                aux.append(_normalize(item))
+            query = aux
+
+        value["query"] = query
+        return (self.__class__.__name__, value)
+
+
+class Date(base):
+    pass
+
+
+class created(base):
+    pass
+
+
+class effective(base):
+    pass
+
+
+class end(base):
+    pass
+
+
+class expires(base):
+    pass
+
+
+class modified(base):
+    pass
+
+
+class start(base):
+    pass

{plone_app_querystring-3.0.0a2 → plone_app_querystring-3.0.0a3}/src/plone/app/querystring/querybuilder.py

@@ -4,71 +4,29 @@ from plone.app.querystring import queryparser
 from plone.app.querystring.interfaces import IParsedQueryIndexModifier
 from plone.app.querystring.interfaces import IQueryModifier
 from plone.app.querystring.interfaces import IQuerystringRegistryReader
+from plone.base.utils import munge_search_term as _munge_search_term
 from plone.batching import Batch
 from plone.registry.interfaces import IRegistry
 from Products.CMFCore.utils import getToolByName
 from zope.component import getMultiAdapter
 from zope.component import getUtilitiesFor
 from zope.component import getUtility
+from zope.deferredimport import deprecated
 from zope.i18n import translate
 from zope.i18nmessageid import MessageFactory
 from zope.publisher.browser import BrowserView
 
 import json
 import logging
-import re
-
 
 logger = logging.getLogger("plone.app.querystring")
 _ = MessageFactory("plone")
 
-# We should accept both a simple space, unicode u'\u0020 but also a
-# multi-space, so called 'waji-kankaku', unicode u'\u3000'
-_MULTISPACE = "\u3000"
-_BAD_CHARS = ("?", "-", "+", "*", _MULTISPACE)
-
-
-def _quote_chars(s):
-    # We need to quote parentheses when searching text indices
-    if "(" in s:
-        s = s.replace("(", '"("')
-    if ")" in s:
-        s = s.replace(")", '")"')
-    if _MULTISPACE in s:
-        s = s.replace(_MULTISPACE, " ")
-    return s
-
-
-def _quote(term):
-    # The terms and, or and not must be wrapped in quotes to avoid
-    # being parsed as logical query atoms.
-    if term.lower() in ("and", "or", "not"):
-        term = '"%s"' % term
-    return _quote_chars(term)
-
-
-def munge_search_term(query):
-    original_query = query
-    for char in _BAD_CHARS:
-        query = query.replace(char, " ")
-
-    # extract quoted phrases first
-    quoted_phrases = re.findall(r'"([^"]*)"', query)
-    r = []
-    for qp in quoted_phrases:
-        # remove from original query
-        query = query.replace(f'"{qp}"', "")
-        # replace with cleaned leading/trailing whitespaces
-        # and skip empty phrases
-        clean_qp = qp.strip()
-        if not clean_qp:
-            continue
-        r.append(f'"{clean_qp}"')
-
-    r += map(_quote, query.strip().split())
-    r = " AND ".join(r)
-    r = r + ("*" if r and not original_query.endswith('"') else "")
-    return r
+deprecated(
+    "Moved to plone.base.utils. Import from there instead "
+    "(will be removed in Plone 7).",
+    munge_search_term="plone.base.utils:munge_search_term",
+)
 
 
 class ContentListingView(BrowserView):
@@ -268,7 +226,7 @@ class QueryBuilder(BrowserView):
         return query
 
     def munge_search_term(self, q):
-        return munge_search_term(q)
+        return _munge_search_term(q)
 
 
 class RegistryConfiguration(BrowserView):

{plone_app_querystring-3.0.0a2 → plone_app_querystring-3.0.0a3}/src/plone/app/querystring/queryparser.py

@@ -13,7 +13,6 @@ from zope.component import getUtilitiesFor
 from zope.component import getUtility
 from zope.dottedname.resolve import resolve
 
-
 Row = namedtuple("Row", ["index", "operator", "values"])
 PATH_INDICES = {"path"}
 

{plone_app_querystring-3.0.0a2 → plone_app_querystring-3.0.0a3}/src/plone/app/querystring/registryreader.py

@@ -14,7 +14,6 @@ from zope.schema.interfaces import IVocabularyFactory
 
 import logging
 
-
 try:
     from plone.app.content.browser.vocabulary import DEFAULT_PERMISSION
     from plone.app.content.browser.vocabulary import PERMISSIONS

{plone_app_querystring-3.0.0a2 → plone_app_querystring-3.0.0a3}/src/plone/app/querystring/tests/registry_testdata.py

@@ -1,6 +1,5 @@
 import os
 
-
 parsed_correct = {
     "plone": {
         "app": {

{plone_app_querystring-3.0.0a2 → plone_app_querystring-3.0.0a3}/src/plone/app/querystring/tests/testIndexmodifiers.py

@@ -6,24 +6,6 @@ import unittest
 
 
 class TestIndexModifiers(unittest.TestCase):
-    def test_subject_encoded(self):
-        self.assertEqual(
-            query_index_modifiers.Subject()({"query": "foobar"}),
-            ("Subject", {"query": "foobar"}),
-        )
-
-    def test_subject_encoded__list(self):
-        self.assertEqual(
-            query_index_modifiers.Subject()({"query": ["foobar"]}),
-            ("Subject", {"query": ["foobar"]}),
-        )
-
-    def test_subject_encoded__list_not(self):
-        self.assertEqual(
-            query_index_modifiers.Subject()({"not": ["foobar"]}),
-            ("Subject", {"not": ["foobar"]}),
-        )
-
     def test_date_modifier(self):
         modifier = query_index_modifiers.start()
         self.assertTrue(

{plone_app_querystring-3.0.0a2 → plone_app_querystring-3.0.0a3}/src/plone/app/querystring/tests/testQueryBuilder.py

@@ -333,80 +333,6 @@ class TestQuerybuilder(unittest.TestCase):
         self.assertEqual(len(results), 1)
         self.assertEqual(results[0].Title(), "Collectionstestpage 2")
 
-    def test_munge_search_term(self):
-        from plone.app.querystring.querybuilder import _BAD_CHARS
-        from plone.app.querystring.querybuilder import munge_search_term
-
-        search_term_tests = [
-            (
-                # search term
-                "spam ham",
-                "spam AND ham*",
-            ),
-            (
-                # quoted term
-                '"spam ham"',
-                '"spam ham"',
-            ),
-            (
-                # cleanup quoted terms
-                '" spam ham   "',
-                '"spam ham"',
-            ),
-            (
-                # quoted term with inner parenthesis
-                '"spam (ham)"',
-                '"spam (ham)"',
-            ),
-            (
-                # quoted term with inner parenthesis
-                '"spam" (ham)',
-                '"spam" AND "("ham")"*',
-            ),
-            (
-                # quoted term with inner parenthesis
-                '"(spam ham)"',
-                '"(spam ham)"',
-            ),
-            (
-                # mixed cases
-                "Spam hAm",
-                "Spam AND hAm*",
-            ),
-            (
-                # mix quoting and unquoted
-                'let\'s eat some "ham and eggs " without spam ',
-                '"ham and eggs" AND let\'s AND eat AND some ' "AND without AND spam*",
-            ),
-            (
-                'test "Welcome" to "Plone" retest',
-                '"Welcome" AND "Plone" AND test AND to AND retest*',
-            ),
-            (
-                # parentheses
-                "spam (ham)",
-                'spam AND "("ham")"*',
-            ),
-            (
-                # special keywords
-                "spam or not ham and eggs",
-                'spam AND "or" AND "not" AND ham AND "and" AND eggs*',
-            ),
-            (
-                # bad characters
-                " ".join(_BAD_CHARS),
-                "",
-            ),
-            (
-                # weird input
-                'test ""Welcome" to "Plone"" retest',
-                '"to" AND test AND WelcomePlone AND retest*',
-            ),
-        ]
-
-        for _in, _out in search_term_tests:
-            self.assertEqual(munge_search_term(_in), _out)
-
     def test_query_builder_unknown_sort(self):
         results = self.querybuilder(query=self.query, sort_on="unknown")
         self.assertEqual(len(results), 1)

{plone_app_querystring-3.0.0a2 → plone_app_querystring-3.0.0a3}/src/plone/app/querystring/tests/testQueryParser.py

@@ -19,7 +19,6 @@ from zope.interface import implementer
 
 import unittest
 
-
 MOCK_SITE_ID = "site"
 
 

{plone_app_querystring-3.0.0a2 → plone_app_querystring-3.0.0a3}/src/plone/app/querystring/vocabularies.py

@@ -5,7 +5,6 @@ from zope.component.hooks import getSite
 from zope.interface import implementer
 from zope.schema.interfaces import IVocabularyFactory
 
-
 # this vocabulary is in this package by intend.
 # since plone.app.querystring depends on plone.app.vocabularies
 # we can not put it over there without creating a circular dependency.

{plone_app_querystring-3.0.0a2 → plone_app_querystring-3.0.0a3/src/plone.app.querystring.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plone.app.querystring
-Version: 3.0.0a2
+Version: 3.0.0a3
 Summary: A queryparser, querybuilder and extra helper tools, to parse stored queries to actual results, used in new style Plone collections
 Home-page: https://github.com/plone/plone.app.querystring
 Author: Plone Foundation
@@ -88,6 +88,26 @@ Changelog
 
 .. towncrier release notes start
 
+3.0.0a3 (2026-03-30)
+--------------------
+
+Bug fixes:
+
+
+- Fix multi-word search so all word parts get wildcard prefix matching, not just the last one.
+  Use ``munge_search_term`` from ``plone.base.utils``, deprecate old import path.
+  @jensens (#4205)
+
+
+Internal:
+
+
+- Remove Subject index modifier — a Python 2 leftover that was already a no-op.
+  @jensens (#155)
+- Update configuration files.
+  [plone devs]
+
+
 3.0.0a2 (2025-11-26)
 --------------------
 

plone_app_querystring-3.0.0a2/src/plone/app/querystring/indexmodifiers/query_index_modifiers.py

@@ -1,107 +0,0 @@
-from dateutil.parser import parse
-from plone.app.querystring.interfaces import IParsedQueryIndexModifier
-from zope.interface import implementer
-
-
-@implementer(IParsedQueryIndexModifier)
-class Subject:
-    """
-    The Subject field in Plone currently uses a utf-8 encoded string.
-    When a catalog query tries to compare a unicode string from the
-    parsedquery with existing utf-8 encoded string indexes unindexing
-    will fail with a UnicodeDecodeError. To prevent this from happening
-    we always encode the Subject query.
-
-    XXX: As soon as Plone uses unicode for all indexes, this code can
-    be removed.
-    """
-
-    def __call__(self, value):
-        return ("Subject", value)
-
-        # Get the query operator
-        op = None
-        if "query" in value:
-            op = "query"
-        elif "not" in value:
-            op = "not"
-
-        query = value[op]
-        # query can be a unicode string or a list of unicode strings.
-        if isinstance(query, str):
-            query = query.encode("utf-8")
-        elif isinstance(query, list):
-            # We do not want to change the collections' own query string,
-            # therefore we create a new copy of the list.
-            copy_of_query = list(query)
-            # Iterate over all query items and encode them if they are
-            # unicode strings
-            i = 0
-            for item in copy_of_query:
-                if isinstance(item, str):
-                    copy_of_query[i] = item.encode("utf-8")
-                i += 1
-            query = copy_of_query
-        else:
-            pass
-        value[op] = query
-        return ("Subject", value)
-
-
-@implementer(IParsedQueryIndexModifier)
-class base:
-    """DateIndex query modifier
-    see Products.PluginIndexes.DateIndex.DateIndex.DateIndex._convert function
-    """
-
-    def __call__(self, value):
-        def _normalize(val):
-            """Encode value, parse dates."""
-
-            if isinstance(val, str):
-                try:
-                    val = parse(val)
-                except (ValueError, AttributeError):
-                    pass
-
-            return val
-
-        query = value["query"]
-        query = _normalize(query)
-
-        if isinstance(query, list):
-            aux = list()
-            for item in query:
-                aux.append(_normalize(item))
-            query = aux
-
-        value["query"] = query
-        return (self.__class__.__name__, value)
-
-
-class Date(base):
-    pass
-
-
-class created(base):
-    pass
-
-
-class effective(base):
-    pass
-
-
-class end(base):
-    pass
-
-
-class expires(base):
-    pass
-
-
-class modified(base):
-    pass
-
-
-class start(base):
-    pass