Merge pull request #175 from trjaffe/master

fix to registry.regsearch() waveband option
astropy · Sep 18, 2019 · a26cb0a · a26cb0a
2 parents 6b40523 + ee5204e
commit a26cb0a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git 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)
 ==================

diff --git 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:

diff --git 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')