Merge pull request #431 from keflavich/vizier/max_catalogs

Vizier query fails to parse

Author: keflavich

astroquery/vizier/core.py

@@ -123,7 +123,8 @@ def keywords(self, value):
     def keywords(self):
         self._keywords = None
 
-    def find_catalogs(self, keywords, include_obsolete=False, verbose=False):
+    def find_catalogs(self, keywords, include_obsolete=False, verbose=False,
+                      max_catalogs=None):
         """
         Search Vizier for catalogs based on a set of keywords, e.g. author name
 
@@ -136,6 +137,9 @@ def find_catalogs(self, keywords, include_obsolete=False, verbose=False):
             only the catalogues characterized by all the words are selected."
         include_obsolete : bool, optional
             If set to True, catalogs marked obsolete will also be returned.
+        max_catalogs : int or None
+            The maximum number of catalogs to return.  If ``None``, all
+            catalogs will be returned.
 
         Returns
         -------
@@ -159,10 +163,15 @@ def find_catalogs(self, keywords, include_obsolete=False, verbose=False):
             keywords = " ".join(keywords)
 
         data_payload = {'-words': keywords, '-meta.all': 1}
+        if max_catalogs is not None:
+            data_payload['-meta.max'] = max_catalogs
         response = self._request(method='POST',
                                  url=self._server_to_url(),
                                  data=data_payload,
                                  timeout=self.TIMEOUT)
+        if 'STOP, Max. number of RESOURCE reached' in response.content:
+            raise ValueError("Maximum number of catalogs exceeded.  Try setting max_catalogs "
+                             "to a large number and try again")
         result = self._parse_result(response, verbose=verbose, get_catalog_names=True)
 
         # Filter out the obsolete catalogs, unless requested

astroquery/vizier/tests/test_vizier_remote.py

@@ -1,7 +1,8 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 
-from astropy.tests.helper import remote_data
+from astropy.tests.helper import remote_data,pytest
 import astropy.units as u
+from astropy import coordinates
 from ... import vizier
 from ...utils import commons
 import requests
@@ -59,8 +60,8 @@ def test_query_two_wavelengths(self):
                                column_filters={"Vmag":">10"}, keywords=["optical", "radio"])
         v.query_object('M 31')
 
-    def regressiontest_invalidtable(self):
-        V = Vizier(columns=['all'], ucd='(spect.dopplerVeloc*|phys.veloc*)',
+    def test_regressiontest_invalidtable(self):
+        V = vizier.core.Vizier(columns=['all'], ucd='(spect.dopplerVeloc*|phys.veloc*)',
                    keywords=['Radio', 'IR'], row_limit=5000)
         C = coordinates.SkyCoord(359.61687 * u.deg, -0.242457 * u.deg, frame='galactic')
 
@@ -79,3 +80,14 @@ def test_multicoord(self):
         assert len(result) >= 5
         assert 'I/239/hip_main' in result.keys()
         assert result['I/239/hip_main']['HIP'] == 98298
+
+    def test_findcatalog_maxcatalog(self):
+        V = vizier.core.Vizier()
+        cats = V.find_catalogs('eclipsing binary', max_catalogs=5000)
+        assert len(cats) >= 468
+
+        #with pytest.raises(ValueError) as exc:
+        #    V.find_catalogs('eclipsing binary')
+        #assert str(exc.value)==("Maximum number of catalogs exceeded."
+        #                        "  Try setting max_catalogs "
+        #                        "to a large number and try again")