fix some of the upload parameters now that multiple surveys can be

queried

Author: keflavich

astroquery/eso/core.py

@@ -126,7 +126,11 @@ def _activate_form(self, response, form_index=0, inputs={}, cache=True,
                             value = form_elem.select('option')[0].string
 
             if key in inputs:
-                value = str(inputs[key])
+                if isinstance(inputs[key], list):
+                    # list input is accepted (for array uploads)
+                    value = inputs[key]
+                else:
+                    value = str(inputs[key])
             if (key is not None):# and (value is not None):
                 if fmt == 'multipart/form-data':
                     if is_file:
@@ -248,16 +252,41 @@ def list_instruments(self, cache=True):
             self._instrument_list.append(u'harps')
         return self._instrument_list
 
+    def list_surveys(self, cache=True):
+        """ List all the available surveys (phase 3) in the ESO archive.
+        Returns
+        -------
+        survey_list : list of strings
+        cache : bool
+            Cache the response for faster subsequent retrieval
+        """
+        if self._survey_list is None:
+            survey_list_response = self._request(
+                "GET", "http://archive.eso.org/wdb/wdb/adp/phase3_main/form",
+                cache=cache)
+            root = BeautifulSoup(survey_list_response.content, 'html5lib')
+            self._survey_list = []
+            collections_table = root.find('table', id='collections_table')
+            other_collections = root.find('select', id='collection_name_option')
+            for element in (collections_table.findAll('input', type='checkbox') +
+                            other_collections.findAll('option')):
+                if 'value' in element.attrs:
+                    survey = element.attrs['value']
+                    if survey and survey not in self._survey_list and 'Any' not in survey:
+                        self._survey_list.append(survey)
+        return self._survey_list
+
     def query_surveys(self, surveys='', cache=True,
                       help=False, open_form=False, **kwargs):
         """
         Query survey Phase 3 data contained in the ESO archive.
 
         Parameters
         ----------
-        survey : string
-            Name of the survey to query, one of the names returned by
-            `list_surveys()`.
+        survey : string or list
+            Name of the survey(s) to query.  Should beone or more of the names
+            returned by `list_surveys()`.  If specified as a string, should be
+            a comma-separated list of survey names.
         cache : bool
             Cache the response for faster subsequent retrieval
 
@@ -281,6 +310,8 @@ def query_surveys(self, surveys='', cache=True,
             survey_form = self._request("GET", url, cache=cache)
             query_dict = kwargs
             query_dict["wdbo"] = "csv/download"
+            if isinstance(surveys, six.string_types):
+                surveys = surveys.split(",")
             query_dict['collection_name'] = surveys
             if self.ROW_LIMIT >= 0:
                 query_dict["max_rows_returned"] = self.ROW_LIMIT
@@ -301,6 +332,7 @@ def query_surveys(self, surveys='', cache=True,
             else:
                 warnings.warn("Query returned no results", NoResultsWarning)
 
+
     def query_instrument(self, instrument, column_filters={}, columns=[],
                          open_form=False, help=False, cache=True, **kwargs):
         """

astroquery/eso/tests/test_eso.py

@@ -61,8 +61,10 @@ def test_vvv(monkeypatch):
     monkeypatch.setattr(eso, '_request', eso_request)
     eso.cache_location = DATA_DIR
 
-    result_s = eso.query_survey('VVV',
-                                coord1=266.41681662, coord2=-29.00782497)
+    result_s = eso.query_surveys('VVV',
+                                 coord1=266.41681662, coord2=-29.00782497,
+                                 box='01 00 00',
+                                )
     assert result_s is not None
     assert 'Object' in result_s.colnames
     assert 'b333' in result_s['Object']

astroquery/eso/tests/test_eso_remote.py

@@ -39,10 +39,12 @@ def test_SgrAstar(self, temp_dir):
 
         surveys = eso.list_surveys(cache=False)
         assert len(surveys) > 0
-        # result_s = eso.query_survey('VVV', target='Sgr A*')
+        # result_s = eso.query_surveys('VVV', target='Sgr A*')
         # Equivalent, does not depend on SESAME:
-        result_s = eso.query_survey('VVV', coord1=266.41681662,
-                                    coord2=-29.00782497, cache=False)
+        result_s = eso.query_surveys('VVV', coord1=266.41681662,
+                                     coord2=-29.00782497,
+                                     box='01 00 00',
+                                     cache=False)
 
         assert 'midi' in instruments
         assert result_i is not None
@@ -51,6 +53,23 @@ def test_SgrAstar(self, temp_dir):
         assert 'Object' in result_s.colnames
         assert 'b333' in result_s['Object']
 
+    def test_multisurvey(self, temp_dir):
+
+        eso = Eso()
+        eso.cache_location = temp_dir
+        eso.ROW_LIMIT = 200 #first b333 is at 157
+
+        result_s = eso.query_surveys(['VVV','XSHOOTER'],
+                                     coord1=266.41681662,
+                                     coord2=-29.00782497,
+                                     box='01 00 00',
+                                     cache=False)
+
+        assert result_s is not None
+        assert 'Object' in result_s.colnames
+        assert 'b333' in result_s['Object']
+        assert 'Pistol-Star' in result_s['Object']
+
     def test_nologin(self):
         # WARNING: this test will fail if you haven't cleared your cache and
         # you have downloaded this file!
@@ -70,8 +89,8 @@ def test_empty_return(self):
         assert len(surveys) > 0
         # result_s = eso.query_survey(surveys[0], target='M51')
         # Avoid SESAME
-        result_s = eso.query_survey(surveys[0], coord1=202.469575,
-                                    coord2=47.195258, cache=False)
+        result_s = eso.query_surveys(surveys[0], coord1=202.469575,
+                                     coord2=47.195258, cache=False)
 
         assert result_s is None