Merge pull request astropy#8 in JWST/jwst-astroquery from release/jwst-astroquery-0.4.X to master

* commit 'fbd117f836b4701af2eb3c5c63265b54336d0ffa':
  JWSTPCR-135: rephrasing docs
  JWSTPCR-135: MAST token in login, login_gui, set_token and documentation
  JWSTPCR-179: e2e tests and JWSTPCR-184: update to CAOM 2.4
  JWSTPCR-179: e2e tests and remote_data tested
  JWSTPCR-179: remote-data tests

Author: Raul Gutierrez Sanchez

astroquery/jwst/core.py

@@ -38,6 +38,7 @@
 from .data_access import JwstDataHandler
 
 from builtins import isinstance
+from astroquery.jwst.token import TokenDialog
 
 __all__ = ['Jwst', 'JwstClass']
 
@@ -950,7 +951,7 @@ def save_results(self, job, verbose=False):
         return self.__jwsttap.save_results(job, verbose)
 
     def login(self, user=None, password=None, credentials_file=None,
-              verbose=False):
+              token=None, verbose=False):
         """Performs a login.
         TAP+ only
         User and password can be used or a file that contains user name and
@@ -966,13 +967,17 @@ def login(self, user=None, password=None, credentials_file=None,
         credentials_file : str, mandatory if no 'user' & 'password' are
             provided
             file containing user and password in two lines
+        token: str, optional
+            MAST token to have access to propietary data
         verbose : bool, optional, default 'False'
             flag to display information about the process
         """
-        return self.__jwsttap.login(user=user,
-                                    password=password,
-                                    credentials_file=credentials_file,
-                                    verbose=verbose)
+        self.__jwsttap.login(user=user,
+                             password=password,
+                             credentials_file=credentials_file,
+                             verbose=verbose)
+        if token:
+            self.set_token(token)
 
     def login_gui(self, verbose=False):
         """Performs a login using a GUI dialog
@@ -985,6 +990,31 @@ def login_gui(self, verbose=False):
         """
         return self.__jwsttap.login_gui(verbose)
 
+    def login_token_gui(self, verbose=False):
+        """Performs a login using a GUI dialog
+        TAP+ only, with an additiona field to
+        specify a token
+
+        Parameters
+        ----------
+        verbose : bool, optional, default 'False'
+            flag to display information about the process
+        """
+        connHandler = self.__jwsttap._TapPlus__getconnhandler()
+        url = connHandler.get_host_url()
+        loginDialog = TokenDialog(url)
+        loginDialog.show_login()
+        if loginDialog.is_accepted():
+            user = loginDialog.get_user()
+            pwd = loginDialog.get_password()
+            if loginDialog.get_token():
+                token = loginDialog.get_token()
+                self.login(user=user, password=pwd, token=token,
+                           verbose=verbose)
+            else:
+                self.login(user=user, password=pwd, verbose=verbose)
+            # execute login
+
     def logout(self, verbose=False):
         """Performs a logout
         TAP+ only
@@ -996,6 +1026,19 @@ def logout(self, verbose=False):
         """
         return self.__jwsttap.logout(verbose)
 
+    def set_token(self, token):
+        """Links a MAST token to the logged user
+
+        Parameters
+        ----------
+        token: str, mandatory
+            MAST token to have access to propietary data
+        """
+        subcontext = 'session'
+        data = 'action=set&key=mast_token&value=' + token
+        self.__jwsttap._TapPlus__getconnhandler().execute_tappost(subcontext,
+                                                              data)
+
     def get_product_list(self, observation_id=None,
                          cal_level="ALL",
                          product_type=None):
@@ -1122,8 +1165,8 @@ def __get_member_planes(self, planeid, cal_level='ALL'):
                             "product_planeid, mp.calibrationlevel as "\
                             "product_level FROM {0} o JOIN {1} p on "\
                             "o.obsid=p.obsid JOIN {2} m on "\
-                            "o.obsid=m.compositeid JOIN {0} "\
-                            "mo on m.simpleid=mo.observationuri JOIN "\
+                            "o.obsid=m.parentid JOIN {0} "\
+                            "mo on m.memberid=mo.observationuri JOIN "\
                             "{1} mp on mo.obsid=mp.obsid {3}'{4}'"\
                             .format(self.JWST_OBSERVATION_TABLE,
                                     self.JWST_PLANE_TABLE,