clearwing

changeset 195:1cfd9b239725 1.2.3-genius

Fix issue with blue query in datatables processing
author Stelios <stv@roe.ac.uk>
date Tue Jan 17 15:38:56 2017 +0000 (2017-01-17)
parents fdf2974a8e72
children 66f1fd2f7f8d
files src/url_classes/data_tables_processing.py
line diff
     1.1 --- a/src/url_classes/data_tables_processing.py	Mon Jan 16 15:29:19 2017 +0000
     1.2 +++ b/src/url_classes/data_tables_processing.py	Tue Jan 17 15:38:56 2017 +0000
     1.3 @@ -1028,8 +1028,13 @@
     1.4          if save_as != "" and save_as != None and queryid!="":
     1.5              web.header('Content-Type', 'multipart/form-data')
     1.6              if save_as=='vo':
     1.7 +                query = firethorn_base  + '/blue/query/' + queryid
     1.8 +                request = urllib2.Request(query, headers={"Accept" : "application/json", "firethorn.auth.identity" : session.get("email","unknown user"), "firethorn.auth.community" : $
     1.9 +                f = urllib2.urlopen(request)
    1.10 +                query_json = json.loads(f.read())
    1.11 +                queryvotable = query_json["results"]["formats"]["votable"]
    1.12 +
    1.13                  web.header('Content-disposition', 'attachment; filename=download.xml')
    1.14 -                queryvotable = firethorn_base  + '/adql/query/' + queryid + '/votable'
    1.15                  req = urllib2.Request( queryvotable, headers={ "firethorn.auth.identity" : session.get("email","unknown user"), "firethorn.auth.community" : session.get("community_input","public (unknown)")} )
    1.16                  response = urllib2.urlopen(req)
    1.17                  return_votable = response.read()