update ALMA help docs and ALMA help parsing

Author: adamginsburg

astroquery/alma/core.py

@@ -10,6 +10,7 @@
 import numpy as np
 import re
 import tarfile
+import string
 from bs4 import BeautifulSoup
 
 from astropy.extern.six.moves.urllib_parse import urljoin
@@ -678,6 +679,20 @@ def _get_help_page(self, cache=True):
                             checkbox = "[x]" if checked else "[ ]"
                             help_section[1].append((name, payload_keyword,
                                                     checkbox, value))
+                    select = inp.find('select')
+                    if select is not None:
+                        options = [(filter_printable(option.text),
+                                    option.attrs['value'])
+                                   for option in select.findAll('option')]
+                        if sp is not None:
+                            name = whitespace.sub(" ", sp.text)
+                        else:
+                            name = select.attrs['name']
+                        option_str = " , ".join(["{0} = {1}".format(o[0],o[1])
+                                                 for o in options])
+                        help_section[1].append((name, option_str))
+
+
                 help_list.append(help_section)
             self._help_list = help_list
 
@@ -856,3 +871,7 @@ def unique(seq):
     seen = set()
     seen_add = seen.add
     return [x for x in seq if not (x in seen or seen_add(x))]
+
+def filter_printable(s):
+    """ extract printable characters from a string """
+    return filter(lambda x: x in string.printable, s)

docs/alma/alma.rst

@@ -21,35 +21,37 @@ You can get interactive help to find out what keywords to query for:
    Valid ALMA keywords:
 
    Position
-     Source name (Sesame)             : source_name_sesame
-     Source name (ALMA)               : source_name-asu
-     RA Dec                           : raDecCoordinates
+     Source name (Resolver)           : source_name_resolver
+     Source name (ALMA)               : source_name_alma
+     RA Dec                           : ra_dec
 
    Energy
-     Frequency                        : energy.frequency-asu
-     Bandwidth                        : energy.bandwidth-asu
-     Spectral resolution              : energy.resolution-asu
-     Band                             : band-asu
+     Frequency                        : frequency
+     Bandwidth                        : bandwidth
+     Spectral resolution              : spectral_resolution
+     Band                             : 3(84-116 GHz) = 3 , 4(125-163 GHz) = 4 , 6(211-275 GHz) = 6 , 7(275-373 GHz) = 7 , 8(385-500 GHz) = 8 , 9(602-720 GHz) = 9 , 10(787-950 GHz) = 10
 
    Time
-     Observation date                 : start_date-asu
-     Integration time                 : int_time-asu
+     Observation date                 : start_date
+     Integration time                 : integration_time
 
    Polarisation
-     Polarisation type                : energy.pol_num-asu
+     Polarisation type                : Stokes I = 0 , Single = 1 , Dual = 2 , Full = =3|4
 
    Observation
-     Water vapour                     : pwv-asu
+     Water vapour                     : water_vapour
 
    Project
-     Project code                     : project_code-asu
-     Project title                    : project.title-substr
-     PI name                          : project.pi_name-substr
+     Project code                     : project_code
+     Project title                    : project_title
+     PI name                          : pi_name
 
    Options
-     View:                            : viewFormat
-     [x] public data only             : publicFilterFlag     = public
-     [x] science observations only    : scan_intent-asu      = =%TARGET%
+     (I) View:                        : result_view          = raw
+     ( ) View:                        : result_view          = project
+     [x] public data only             : public_data          = public
+     [x] science observations only    : science_observations = =%TARGET%
+   
 
 Authentication
 ==============