From 0f18d53bb97ae9582bfd9963962d88ca2aa1ea0d Mon Sep 17 00:00:00 2001
From: Dazhi Wang <ch2ohch2oh@gmail.com>
Date: Sat, 14 Oct 2023 13:37:07 -0400
Subject: [PATCH 1/3] Make bool values lowercase in solr query url

---
 pysolr.py            | 31 +++++++++++++++++++++++++------
 tests/test_client.py | 11 +++++++++++
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/pysolr.py b/pysolr.py
index 59b4fcbd..b5e700bd 100644
--- a/pysolr.py
+++ b/pysolr.py
@@ -191,6 +191,9 @@ def safe_urlencode(params, doseq=0):
     which can't fail down to ascii.
     """
     if IS_PY3:
+        for key, val in params.items():
+            if isinstance(val, bool):
+                params[key] = str(val).lower()
         return urlencode(params, doseq)
 
     if hasattr(params, "items"):
@@ -300,6 +303,16 @@ def __iter__(self):
             result = result._next_page_query and result._next_page_query()
 
 
+def get_nested(obj, keys, default=None):
+    """Nested key lookup for a dict-like object."""
+    try:
+        for k in keys:
+            obj = obj[k]
+        return obj
+    except KeyError:
+        return default
+
+
 class Solr(object):
     """
     The main object for working with Solr.
@@ -528,7 +541,7 @@ def _update(
         path_handler = handler
         if self.use_qt_param:
             path_handler = "select"
-            query_vars.append("qt=%s" % safe_urlencode(handler, True))
+            query_vars.append("qt=%s" % handler)
 
         path = "%s/" % path_handler
 
@@ -830,11 +843,17 @@ def search(self, q, search_handler=None, **kwargs):
         response = self._select(params, handler=search_handler)
         decoded = self.decoder.decode(response)
 
-        self.log.debug(
-            "Found '%s' search results.",
-            # cover both cases: there is no response key or value is None
-            (decoded.get("response", {}) or {}).get("numFound", 0),
-        )
+        if decoded.get("grouped"):
+            group_key = next(iter(decoded["grouped"]))
+            self.log.debug(
+                "Found results grouped by '%s' with %d matches",
+                group_key,
+                decoded["grouped"][group_key]["matches"],
+            )
+        else:
+            self.log.debug(
+                "Found %d docs", get_nested(decoded, ["response", "numFound"], 0)
+            )
 
         cursorMark = params.get("cursorMark", None)
         if cursorMark != decoded.get("nextCursorMark", cursorMark):
diff --git a/tests/test_client.py b/tests/test_client.py
index 7a7ed5af..f5da102c 100644
--- a/tests/test_client.py
+++ b/tests/test_client.py
@@ -6,6 +6,7 @@
 import random
 import time
 import unittest
+import json
 from io import StringIO
 from xml.etree import ElementTree
 
@@ -21,6 +22,7 @@
     safe_urlencode,
     sanitize,
     unescape_html,
+    get_nested,
 )
 
 try:
@@ -72,6 +74,9 @@ def test_safe_urlencode(self):
             "test=Hello \u2603!&test=Helllo world!",
         )
 
+        # Boolean options for Solr should be in lowercase.
+        self.assertTrue("True" not in safe_urlencode(dict(group=True)))
+
     def test_sanitize(self):
         self.assertEqual(
             sanitize(
@@ -101,6 +106,12 @@ def test_force_bytes(self):
     def test_clean_xml_string(self):
         self.assertEqual(clean_xml_string("\x00\x0b\x0d\uffff"), "\x0d")
 
+    def test_get_nested(self):
+        doc = {"a": {"b": {"c": 2023}}}
+        self.assertEqual(get_nested(doc, ["a", "e"]), None)
+        self.assertEqual(get_nested(doc, ["a"]), doc["a"])
+        self.assertEqual(get_nested(doc, ["a", "b", "c"]), doc["a"]["b"]["c"])
+
 
 class ResultsTestCase(unittest.TestCase):
     def test_init(self):

From 5876d4b5747e0c1454276b24c63925b53bb8bf47 Mon Sep 17 00:00:00 2001
From: Dazhi Wang <ch2ohch2oh@gmail.com>
Date: Sat, 14 Oct 2023 13:44:59 -0400
Subject: [PATCH 2/3] Fix style errors

---
 tests/test_client.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/test_client.py b/tests/test_client.py
index f5da102c..4fb0c1fa 100644
--- a/tests/test_client.py
+++ b/tests/test_client.py
@@ -6,7 +6,6 @@
 import random
 import time
 import unittest
-import json
 from io import StringIO
 from xml.etree import ElementTree
 
@@ -18,11 +17,10 @@
     clean_xml_string,
     force_bytes,
     force_unicode,
-    json,
+    get_nested,
     safe_urlencode,
     sanitize,
     unescape_html,
-    get_nested,
 )
 
 try:
@@ -75,7 +73,7 @@ def test_safe_urlencode(self):
         )
 
         # Boolean options for Solr should be in lowercase.
-        self.assertTrue("True" not in safe_urlencode(dict(group=True)))
+        self.assertTrue("True" not in safe_urlencode({"group": True}))
 
     def test_sanitize(self):
         self.assertEqual(

From 244a2f7a20e7da9093734cd78d7bc21c6d13d881 Mon Sep 17 00:00:00 2001
From: Dazhi Wang <ch2ohch2oh@gmail.com>
Date: Sat, 14 Oct 2023 13:48:49 -0400
Subject: [PATCH 3/3] Fix import error

---
 tests/test_client.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/test_client.py b/tests/test_client.py
index 4fb0c1fa..9f23b9b1 100644
--- a/tests/test_client.py
+++ b/tests/test_client.py
@@ -3,6 +3,7 @@
 from __future__ import absolute_import, unicode_literals
 
 import datetime
+import json
 import random
 import time
 import unittest