@@ -1358,34 +1358,34 @@ def _sanitize_input_radius(self, radius):
1358
1358
1359
1359
def _sanitize_input_mission (self , missions ):
1360
1360
if isinstance (missions , list ):
1361
- return missions
1361
+ return [ m . upper () for m in missions ]
1362
1362
if isinstance (missions , str ):
1363
1363
if missions .lower () == self .__ALL_STRING :
1364
1364
return self .list_maps ()
1365
1365
else :
1366
- return [missions ]
1366
+ return [missions . upper () ]
1367
1367
raise ValueError ("Mission must be either a string or a list of "
1368
1368
"missions" )
1369
1369
1370
1370
def _sanitize_input_spectra (self , spectra ):
1371
1371
if isinstance (spectra , list ):
1372
- return spectra
1372
+ return [ s . upper () for s in spectra ]
1373
1373
if isinstance (spectra , str ):
1374
1374
if spectra .lower () == self .__ALL_STRING :
1375
1375
return self .list_spectra ()
1376
1376
else :
1377
- return [spectra ]
1377
+ return [spectra . upper () ]
1378
1378
raise ValueError ("Spectra must be either a string or a list of "
1379
1379
"Spectra" )
1380
1380
1381
1381
def _sanitize_input_catalogs (self , catalogs ):
1382
1382
if isinstance (catalogs , list ):
1383
- return catalogs
1383
+ return [ c . upper () for c in catalogs ]
1384
1384
if isinstance (catalogs , str ):
1385
1385
if catalogs .lower () == self .__ALL_STRING :
1386
1386
return self .list_catalogs ()
1387
1387
else :
1388
- return [catalogs ]
1388
+ return [catalogs . upper () ]
1389
1389
raise ValueError ("Catalog must be either a string or a list of "
1390
1390
"catalogs" )
1391
1391
@@ -1798,7 +1798,7 @@ def _store_query_result(self, query_result, names, descriptors, verbose=False, *
1798
1798
for name in names :
1799
1799
table = self ._query (name = name , descriptors = descriptors , verbose = verbose , ** kwargs )
1800
1800
if len (table ) > 0 :
1801
- query_result [name . upper () ] = table
1801
+ query_result [name ] = table
1802
1802
1803
1803
def _get_observation_info (self ):
1804
1804
return self ._get_descriptors (category = 'observations' )
@@ -1818,7 +1818,7 @@ def _get_descriptors(self, category):
1818
1818
join tap_schema.columns dec on d.table_name = dec.table_name
1819
1819
where d.category = '{}' and ra.ucd = 'pos.eq.ra;meta.main' and dec.ucd = 'pos.eq.dec;meta.main'
1820
1820
""" .format (category )
1821
- return {d ['mission' ]: {a : d [a ] for a in d .keys ()} for d in self .query (query )}
1821
+ return {d ['mission' ]. upper () : {a : d [a ] for a in d .keys ()} for d in self .query (query )}
1822
1822
1823
1823
def _table_for_mission (self , mission , descriptors ):
1824
1824
tables = {d ['mission' ].lower (): d ['table_name' ] for d in descriptors .values ()}
0 commit comments