Merge pull request #441 from keflavich/alma/validator

Validate *values* of ALMA queries

Author: keflavich

astroquery/alma/core.py

@@ -128,13 +128,41 @@ def query_async(self, payload, cache=True, public=True, science=True):
         if science:
             payload['scan_intent-asu'] = '=*TARGET*'
 
-        self._validate_payload(payload)
+        self.validate_query(payload)
 
         response = self._request('GET', url, params=payload,
                                  timeout=self.TIMEOUT, cache=cache)
         response.raise_for_status()
 
         return response
+    
+    def validate_query(self, payload, cache=True):
+        """
+        Use the ALMA query validator service to check whether the keywords are
+        valid
+        """
+        
+        # Check that the keywords specified are allowed
+        self._validate_payload(payload)
+
+        vurl = self._get_dataarchive_url() + '/aq/validate'
+
+        bad_kws = {}
+
+        for kw in payload:
+            vpayload = {'field':kw,
+                        kw: payload[kw]}
+            response = self._request('GET', vurl, params=vpayload, cache=cache,
+                                     timeout=self.TIMEOUT)
+
+            if response.content:
+                bad_kws[kw] = response.content
+
+        if bad_kws:
+            raise InvalidQueryError("Invalid query parameters: "
+                                    "{0}".format(bad_kws))
+
+
 
     def _get_dataarchive_url(self):
         """

astroquery/alma/tests/data/empty.html

@@ -19,7 +19,9 @@ def data_path(filename):
                       'http://almascience.eso.org/rh/submission/d45d0552-8479-4482-9833-fecdef3f8b90':
                       'staging_submission.html',
                       'http://almascience.eso.org/aq/':
-                      'querypage.html'
+                      'querypage.html',
+                      'http://almascience.eso.org/aq/validate':
+                      'empty.html'
                      },
               'POST': {'http://almascience.eso.org/rh/submission':
                        'initial_response.html'}