From 68b7b98dd8bb554dacceb79caae17135cda28e0b Mon Sep 17 00:00:00 2001 From: Jaffe Date: Tue, 17 Sep 2019 11:30:10 -0400 Subject: [PATCH 1/3] Fixed regsearch bug with waveband specified. --- pyvo/registry/regtap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyvo/registry/regtap.py b/pyvo/registry/regtap.py index 6fa769a3c..4397b7a15 100644 --- a/pyvo/registry/regtap.py +++ b/pyvo/registry/regtap.py @@ -119,7 +119,7 @@ def _unions(): """) if waveband: - wheres.append("1 = ivo_hashlist_has('{}', waveband)".format( + wheres.append("1 = ivo_hashlist_has(rr.resource.waveband, '{}')".format( tap.escape(waveband))) if datamodel: From be5d57d11ae6ff3ad0d803f770133556097acec0 Mon Sep 17 00:00:00 2001 From: Jaffe Date: Tue, 17 Sep 2019 12:39:32 -0400 Subject: [PATCH 2/3] Unit test updated for regsearch bug fix. --- pyvo/registry/tests/test_regtap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyvo/registry/tests/test_regtap.py b/pyvo/registry/tests/test_regtap.py index a0c34476d..5d5af7f00 100644 --- a/pyvo/registry/tests/test_regtap.py +++ b/pyvo/registry/tests/test_regtap.py @@ -83,7 +83,7 @@ def wavebandtest_callback(request, content): data = dict(parse_qsl(request.body)) query = data['QUERY'] - assert "1 = ivo_hashlist_has('optical', waveband" in query + assert "1 = ivo_hashlist_has(rr.resource.waveband, 'optical'" in query return get_pkg_data_contents('data/regtap.xml') From ee5204ecf8750f677a6d35b22dc3deec303ea63f Mon Sep 17 00:00:00 2001 From: Jaffe Date: Tue, 17 Sep 2019 14:00:50 -0400 Subject: [PATCH 3/3] Adding CHANGES entry --- CHANGES.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 164c60d56..4924829b7 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -17,6 +17,8 @@ - Update ex_casA_image_cat example. [#172] +- Fix waveband option in registry.regsearch [#175] + 0.9.3 (2019-05-30) ==================