Skip to content

Commit 326c23f

Browse files
committed
vo_conesearch: Update Vizier domain
1 parent aa45b69 commit 326c23f

File tree

8 files changed

+16
-16
lines changed

8 files changed

+16
-16
lines changed

astroquery/vo_conesearch/tests/test_conesearch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class TestConeSearch:
5050
"""
5151
def setup_class(self):
5252
# If this link is broken, use the next in database that works
53-
self.url = ('http://vizier.u-strasbg.fr/viz-bin/votable/-A?-out.all&'
53+
self.url = ('http://vizier.unistra.fr/viz-bin/votable/-A?-out.all&'
5454
'-source=I/252/out&')
5555
self.catname = 'USNO-A2'
5656

astroquery/vo_conesearch/validator/data/conesearch_urls.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
http://gsss.stsci.edu/webservices/vo/ConeSearch.aspx?CAT=GSC23&
2-
http://vizier.u-strasbg.fr/viz-bin/conesearch/I/220/out?
3-
http://vizier.u-strasbg.fr/viz-bin/conesearch/I/243/out?
4-
http://vizier.u-strasbg.fr/viz-bin/conesearch/I/252/out?
5-
http://vizier.u-strasbg.fr/viz-bin/conesearch/I/254/out?
6-
http://vizier.u-strasbg.fr/viz-bin/conesearch/I/255/out?
7-
http://vizier.u-strasbg.fr/viz-bin/conesearch/I/284/out?
8-
http://vizier.u-strasbg.fr/viz-bin/conesearch/I/345/gaia2?
9-
http://vizier.u-strasbg.fr/viz-bin/conesearch/II/246/out?
2+
http://vizier.unistra.fr/viz-bin/conesearch/I/220/out?
3+
http://vizier.unistra.fr/viz-bin/conesearch/I/243/out?
4+
http://vizier.unistra.fr/viz-bin/conesearch/I/252/out?
5+
http://vizier.unistra.fr/viz-bin/conesearch/I/254/out?
6+
http://vizier.unistra.fr/viz-bin/conesearch/I/255/out?
7+
http://vizier.unistra.fr/viz-bin/conesearch/I/284/out?
8+
http://vizier.unistra.fr/viz-bin/conesearch/I/345/gaia2?
9+
http://vizier.unistra.fr/viz-bin/conesearch/II/246/out?
1010
http://wfaudata.roe.ac.uk/sdssdr7-dsa/DirectCone?DSACAT=SDSS_DR7&DSATAB=Galaxy&
1111
http://wfaudata.roe.ac.uk/sdssdr7-dsa/DirectCone?DSACAT=SDSS_DR7&DSATAB=PhotoObj&
1212
http://wfaudata.roe.ac.uk/sdssdr7-dsa/DirectCone?DSACAT=SDSS_DR7&DSATAB=PhotoObjAll&

astroquery/vo_conesearch/validator/tests/data/conesearch_good.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"std_version": "",
3131
"title": "The USNO-A2.0 Catalogue (Monet+ 1998)",
3232
"updated": "4/5/2018 10:00:00 AM",
33-
"url": "http://vizier.u-strasbg.fr/viz-bin/conesearch/I/252/out?",
33+
"url": "http://vizier.unistra.fr/viz-bin/conesearch/I/252/out?",
3434
"url_use": "base",
3535
"validate_expected": "good",
3636
"validate_network_error": null,
@@ -51,4 +51,4 @@
5151
"wsdl_url": ""
5252
}
5353
}
54-
}
54+
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
The USNO-A2.0 Catalogue (Monet+ 1998) 1
2-
http://vizier.u-strasbg.fr/viz-bin/conesearch/I/252/out?
2+
http://vizier.unistra.fr/viz-bin/conesearch/I/252/out?
33
W22
44
./results/ac/9c/265b875e219ef4a2f5fe540be28f/vo.xml:15:0: W22: The DEFINITIONS element is deprecated in VOTable 1.1. Ignoring
55
./results/ac/9c/265b875e219ef4a2f5fe540be28f/vo.xml:15:0: W22: The DEFINITIONS element is deprecated in VOTable 1.1. Ignoring
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
The USNO-A2.0 Catalogue (Monet+ 1998) 1
2-
http://vizier.u-strasbg.fr/viz-bin/conesearch/I/252/out?
2+
http://vizier.unistra.fr/viz-bin/conesearch/I/252/out?

astroquery/vo_conesearch/validator/tests/data/printcat.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"std_version": "",
2828
"title": "The USNO-A2.0 Catalogue (Monet+ 1998)",
2929
"updated": "4/5/2018 10:00:00 AM",
30-
"url": "http://vizier.u-strasbg.fr/viz-bin/conesearch/I/252/out?",
30+
"url": "http://vizier.unistra.fr/viz-bin/conesearch/I/252/out?",
3131
"url_use": "base",
3232
"validate_expected": "good",
3333
"validate_network_error": null,
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<VOTABLE xmlns:vr="http://www.ivoa.net/xml/VOResource/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vs="http://www.ivoa.net/xml/VODataService/v1.1" version="1.2" xmlns="http://www.ivoa.net/xml/VOTable/v1.2"><RESOURCE type="results"><INFO name="QUERY_STATUS" value="OK"/><TABLE><FIELD datatype="char" name="ivoid" arraysize="*"/><FIELD datatype="short" name="cap_index"/><FIELD datatype="char" name="cap_type" arraysize="*"/><FIELD datatype="char" name="cap_description" arraysize="*"/><FIELD datatype="char" name="standard_id" arraysize="*"/><FIELD datatype="short" name="intf_index"/><FIELD datatype="char" name="intf_type" arraysize="*"/><FIELD datatype="char" name="intf_role" arraysize="*"/><FIELD datatype="char" name="std_version" arraysize="*"/><FIELD datatype="char" name="query_type" arraysize="*"/><FIELD datatype="char" name="result_type" arraysize="*"/><FIELD datatype="char" name="wsdl_url" arraysize="*"/><FIELD datatype="char" name="url_use" arraysize="*"/><FIELD datatype="char" name="access_url" arraysize="*"/><FIELD datatype="char" name="res_type" arraysize="*"/><FIELD datatype="char" name="created" arraysize="*"/><FIELD datatype="char" name="creator_seq" arraysize="*"/><FIELD datatype="char" name="content_type" arraysize="*"/><FIELD datatype="char" name="source_format" arraysize="*"/><FIELD datatype="char" name="source_value" arraysize="*"/><FIELD datatype="char" name="res_version" arraysize="*"/><FIELD datatype="float" name="region_of_regard"/><FIELD datatype="char" name="waveband" arraysize="*"/><FIELD datatype="char" name="rights" arraysize="*"/><FIELD datatype="char" name="short_name" arraysize="*"/><FIELD datatype="char" name="res_title" arraysize="*"/><FIELD datatype="char" name="updated" arraysize="*"/><FIELD datatype="char" name="content_level" arraysize="*"/><FIELD datatype="char" name="res_description" arraysize="*"/><FIELD datatype="char" name="reference_url" arraysize="*"/><FIELD datatype="char" name="res_subject" arraysize="*"/><DATA><TABLEDATA><TR><TD>ivo://cds.vizier/i/252</TD><TD>4</TD><TD>conesearch</TD><TD>Cone search capability for table I/252/out (The Full Catalogue)</TD><TD>ivo://ivoa.net/std/conesearch</TD><TD>1</TD><TD>vs:paramhttp</TD><TD>std</TD><TD/><TD/><TD/><TD/><TD>base</TD><TD>http://vizier.u-strasbg.fr/viz-bin/conesearch/I/252/out?</TD><TD>vs:catalogservice</TD><TD>3/28/2008 6:50:02 AM</TD><TD/><TD>catalog</TD><TD>bibcode</TD><TD/><TD>27-Oct-1998</TD><TD/><TD>optical</TD><TD>public</TD><TD>I/252</TD><TD>The USNO-A2.0 Catalogue (Monet+ 1998)</TD><TD>4/5/2018 10:00:00 AM</TD><TD>research</TD><TD>USNO-A2.0 is a catalog of 526,280,881 stars, and is based on a re-reduction of the Precision Measuring Machine (PMM) scans that were the basis for the USNO-A1.0 catalog. The major difference between A2.0 and A1.0 is that A1.0 used the Guide Star Catalog (Lasker et al. 1986, see Cat. &amp;lt;I/220&amp;gt;) as its reference frame whereas A2.0 uses the ICRF as realized by the USNO ACT catalog (Urban et al. 1997, see Cat. II/246&amp;gt;). A2.0 presents right ascension and declination (J2000, epoch of the mean of the blue and red plate) and the blue and red magnitude for each star. Usage of the ACT catalog as well as usage of new astrometric and photometric reduction algorithms should provide improved astrometry (mostly in the reduction of systematic errors) and improved photometry (because the brightest stars on each plate had B and V magnitudes measured by the Tycho experiment on the Hipparcos satellite). The basic format of the catalog and its compilation is the same as for A1.0, and most users should be able to migrate to this newer version with minimal effort.</TD><TD>http://cdsarc.u-strasbg.fr/cgi-bin/Cat?I/252</TD><TD>Positional_Data</TD></TR></TABLEDATA></DATA></TABLE></RESOURCE></VOTABLE>
2+
<VOTABLE xmlns:vr="http://www.ivoa.net/xml/VOResource/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vs="http://www.ivoa.net/xml/VODataService/v1.1" version="1.2" xmlns="http://www.ivoa.net/xml/VOTable/v1.2"><RESOURCE type="results"><INFO name="QUERY_STATUS" value="OK"/><TABLE><FIELD datatype="char" name="ivoid" arraysize="*"/><FIELD datatype="short" name="cap_index"/><FIELD datatype="char" name="cap_type" arraysize="*"/><FIELD datatype="char" name="cap_description" arraysize="*"/><FIELD datatype="char" name="standard_id" arraysize="*"/><FIELD datatype="short" name="intf_index"/><FIELD datatype="char" name="intf_type" arraysize="*"/><FIELD datatype="char" name="intf_role" arraysize="*"/><FIELD datatype="char" name="std_version" arraysize="*"/><FIELD datatype="char" name="query_type" arraysize="*"/><FIELD datatype="char" name="result_type" arraysize="*"/><FIELD datatype="char" name="wsdl_url" arraysize="*"/><FIELD datatype="char" name="url_use" arraysize="*"/><FIELD datatype="char" name="access_url" arraysize="*"/><FIELD datatype="char" name="res_type" arraysize="*"/><FIELD datatype="char" name="created" arraysize="*"/><FIELD datatype="char" name="creator_seq" arraysize="*"/><FIELD datatype="char" name="content_type" arraysize="*"/><FIELD datatype="char" name="source_format" arraysize="*"/><FIELD datatype="char" name="source_value" arraysize="*"/><FIELD datatype="char" name="res_version" arraysize="*"/><FIELD datatype="float" name="region_of_regard"/><FIELD datatype="char" name="waveband" arraysize="*"/><FIELD datatype="char" name="rights" arraysize="*"/><FIELD datatype="char" name="short_name" arraysize="*"/><FIELD datatype="char" name="res_title" arraysize="*"/><FIELD datatype="char" name="updated" arraysize="*"/><FIELD datatype="char" name="content_level" arraysize="*"/><FIELD datatype="char" name="res_description" arraysize="*"/><FIELD datatype="char" name="reference_url" arraysize="*"/><FIELD datatype="char" name="res_subject" arraysize="*"/><DATA><TABLEDATA><TR><TD>ivo://cds.vizier/i/252</TD><TD>4</TD><TD>conesearch</TD><TD>Cone search capability for table I/252/out (The Full Catalogue)</TD><TD>ivo://ivoa.net/std/conesearch</TD><TD>1</TD><TD>vs:paramhttp</TD><TD>std</TD><TD/><TD/><TD/><TD/><TD>base</TD><TD>http://vizier.unistra.fr/viz-bin/conesearch/I/252/out?</TD><TD>vs:catalogservice</TD><TD>3/28/2008 6:50:02 AM</TD><TD/><TD>catalog</TD><TD>bibcode</TD><TD/><TD>27-Oct-1998</TD><TD/><TD>optical</TD><TD>public</TD><TD>I/252</TD><TD>The USNO-A2.0 Catalogue (Monet+ 1998)</TD><TD>4/5/2018 10:00:00 AM</TD><TD>research</TD><TD>USNO-A2.0 is a catalog of 526,280,881 stars, and is based on a re-reduction of the Precision Measuring Machine (PMM) scans that were the basis for the USNO-A1.0 catalog. The major difference between A2.0 and A1.0 is that A1.0 used the Guide Star Catalog (Lasker et al. 1986, see Cat. &amp;lt;I/220&amp;gt;) as its reference frame whereas A2.0 uses the ICRF as realized by the USNO ACT catalog (Urban et al. 1997, see Cat. II/246&amp;gt;). A2.0 presents right ascension and declination (J2000, epoch of the mean of the blue and red plate) and the blue and red magnitude for each star. Usage of the ACT catalog as well as usage of new astrometric and photometric reduction algorithms should provide improved astrometry (mostly in the reduction of systematic errors) and improved photometry (because the brightest stars on each plate had B and V magnitudes measured by the Tycho experiment on the Hipparcos satellite). The basic format of the catalog and its compilation is the same as for A1.0, and most users should be able to migrate to this newer version with minimal effort.</TD><TD>http://cdsarc.u-strasbg.fr/cgi-bin/Cat?I/252</TD><TD>Positional_Data</TD></TR></TABLEDATA></DATA></TABLE></RESOURCE></VOTABLE>

astroquery/vo_conesearch/validator/tests/test_validate.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def test_url_list(self, parallel):
6969
local_outdir = os.path.join(self.out_dir, 'subtmp1')
7070
local_list = [
7171
'http://www.google.com/foo&',
72-
'http://vizier.u-strasbg.fr/viz-bin/conesearch/I/252/out?']
72+
'http://vizier.unistra.fr/viz-bin/conesearch/I/252/out?']
7373
validate.check_conesearch_sites(destdir=local_outdir,
7474
parallel=parallel,
7575
url_list=local_list)

0 commit comments

Comments
 (0)