OARec: update ES q= support per Req 27 (#2059)

Author: tomkralidis

pygeoapi/provider/elasticsearch_.py

@@ -333,7 +333,11 @@ def query(self, offset=0, limit=10, resulttype='results',
 
         if q is not None:
             LOGGER.debug('Adding free-text search')
-            query['query']['bool']['must'] = {'query_string': {'query': q}}
+            # split inclusive on ',' (OR)
+            q_tokens = [f'"{t}"' for t in q.split(',')]
+            # enclose each token as a search phrase
+            q2 = ' OR '.join(q_tokens)
+            query['query']['bool']['must'] = {'query_string': {'query': q2}}
 
             query['_source'] = {
                 'excludes': [

tests/test_elasticsearch__provider.py

@@ -251,6 +251,22 @@ def test_query(config):
     assert len(results['features'][0]['properties']) == 1
 
 
+def test_query_q(config):
+    p = ElasticsearchProvider(config)
+
+    result = p.query(q='vatican')
+    assert len(result['features']) == 1
+
+    result = p.query(q='vatican,lazio')
+    assert len(result['features']) == 2
+
+    result = p.query(q='vatican lazio')
+    assert len(result['features']) == 0
+
+    result = p.query(q='holy see')
+    assert len(result['features']) == 1
+
+
 def test_query_ordered_properties(config_ordered_properties):
     p = ElasticsearchProvider(config_ordered_properties)