Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit c879666

Browse filesBrowse files
Jorge Fernandez HernandezJorge Fernandez Hernandez
Jorge Fernandez Hernandez
authored and
Jorge Fernandez Hernandez
committed
Include char and unicode arrays
1 parent b22c7b3 commit c879666
Copy full SHA for c879666

25 files changed

+2,153-360Lines changed: 2153 additions & 360 deletions
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎astropy/io/votable/converters.py‎

Copy file name to clipboardExpand all lines: astropy/io/votable/converters.py
+460-164Lines changed: 460 additions & 164 deletions
Large diffs are not rendered by default.
Collapse file

‎astropy/io/votable/tests/data/binary2_fix_length_array_char.xml‎

Copy file name to clipboard
+6-6Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<VOTABLE xmlns="http://www.ivoa.net/xml/VOTable/v1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.4">
33
<RESOURCE type="results">
4-
<INFO name="QUERY_STATUS" value="OK" />
5-
<INFO name="QUERY" value="SELECT TOP 1 access_format FROM ivoa.ObsCore" />
4+
<INFO name="QUERY_STATUS" value="OK"/>
5+
<INFO name="QUERY" value="SELECT TOP 1 access_format FROM ivoa.ObsCore"/>
66
<TABLE>
77
<FIELD name="access_format" datatype="char" arraysize="10x4" ucd="meta.code.mime" utype="Access.format">
88
<DESCRIPTION>Content format of the dataset</DESCRIPTION>
99
</FIELD>
1010
<DATA>
11-
<BINARY2>
11+
<BINARY2>
1212
<STREAM encoding="base64">
1313
ADEyMzQ1Njc4OTBhYmNkZWZnaGlqMDk4NzY1NDMyMWppaGdmZWRjYmE=
1414
</STREAM>
15-
</BINARY2>
16-
</DATA>
17-
</TABLE>
15+
</BINARY2>
16+
</DATA>
17+
</TABLE>
1818
</RESOURCE>
1919
</VOTABLE>
Collapse file

‎astropy/io/votable/tests/data/binary2_fix_length_array_char_with_nulls.xml‎

Copy file name to clipboard
+19Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<VOTABLE xmlns="http://www.ivoa.net/xml/VOTable/v1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.4">
3+
<RESOURCE type="results">
4+
<INFO name="QUERY_STATUS" value="OK"/>
5+
<INFO name="QUERY" value="SELECT TOP 1 access_format FROM ivoa.ObsCore"/>
6+
<TABLE>
7+
<FIELD name="access_format" datatype="char" arraysize="10x4" ucd="meta.code.mime" utype="Access.format">
8+
<DESCRIPTION>Content format of the dataset</DESCRIPTION>
9+
</FIELD>
10+
<DATA>
11+
<BINARY2>
12+
<STREAM encoding="base64">
13+
ADEyMzQ1AAAAAABhYmNkZQAAAAAAMDk4NzYAAAAAAGppaGdmAAAAAAA=
14+
</STREAM>
15+
</BINARY2>
16+
</DATA>
17+
</TABLE>
18+
</RESOURCE>
19+
</VOTABLE>
Collapse file

‎astropy/io/votable/tests/data/binary2_fix_length_array_unicodeChar.xml‎

Copy file name to clipboard
+19Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<VOTABLE xmlns="http://www.ivoa.net/xml/VOTable/v1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.4">
3+
<RESOURCE type="results">
4+
<INFO name="QUERY_STATUS" value="OK"/>
5+
<INFO name="QUERY" value="SELECT TOP 1 access_format FROM ivoa.ObsCore"/>
6+
<TABLE>
7+
<FIELD name="access_format" datatype="unicodeChar" arraysize="10x4" ucd="meta.code.mime" utype="Access.format">
8+
<DESCRIPTION>Content format of the dataset</DESCRIPTION>
9+
</FIELD>
10+
<DATA>
11+
<BINARY2>
12+
<STREAM encoding="base64">
13+
AABjAGEAZgDpADEAMgAzADQANQA2T2BZfQAxADIAMwA0ADUANgA3ADgDsQOyA7MDtAO1ADEAMgAzADQANQBFAHMAcABhAPEAYQAyADAAMgA1
14+
</STREAM>
15+
</BINARY2>
16+
</DATA>
17+
</TABLE>
18+
</RESOURCE>
19+
</VOTABLE>
Collapse file

‎astropy/io/votable/tests/data/binary2_fix_length_array_unicodeChar_with_nulls.xml‎

Copy file name to clipboard
+19Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<VOTABLE xmlns="http://www.ivoa.net/xml/VOTable/v1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.4">
3+
<RESOURCE type="results">
4+
<INFO name="QUERY_STATUS" value="OK"/>
5+
<INFO name="QUERY" value="SELECT TOP 1 access_format FROM ivoa.ObsCore"/>
6+
<TABLE>
7+
<FIELD name="access_format" datatype="unicodeChar" arraysize="10x4" ucd="meta.code.mime" utype="Access.format">
8+
<DESCRIPTION>Content format of the dataset</DESCRIPTION>
9+
</FIELD>
10+
<DATA>
11+
<BINARY2>
12+
<STREAM encoding="base64">
13+
AABjAGEAZgDpADEAAAAAAAAAAAAAT2BZfQAxADIAMwAAAAAAAAAAAAADsQOyA7MDtAO1AAAAAAAAAAAAAABFAHMAcABhAPEAAAAAAAAAAAAA
14+
</STREAM>
15+
</BINARY2>
16+
</DATA>
17+
</TABLE>
18+
</RESOURCE>
19+
</VOTABLE>
Collapse file

‎astropy/io/votable/tests/data/binary2_fix_length_multidimension_array_char.xml‎

Copy file name to clipboard
+19Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<VOTABLE xmlns="http://www.ivoa.net/xml/VOTable/v1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.4">
3+
<RESOURCE type="results">
4+
<INFO name="QUERY_STATUS" value="OK"/>
5+
<INFO name="QUERY" value="SELECT TOP 1 access_format FROM ivoa.ObsCore"/>
6+
<TABLE>
7+
<FIELD name="access_format" datatype="char" arraysize="10x4x2" ucd="meta.code.mime" utype="Access.format">
8+
<DESCRIPTION>Content format of the dataset</DESCRIPTION>
9+
</FIELD>
10+
<DATA>
11+
<BINARY2>
12+
<STREAM encoding="base64">
13+
ADEyMzQ1Njc4OTBhYmNkZWZnaGlqMDk4NzY1NDMyMWppaGdmZWRjYmExMjM0NTY3ODkwYWJjZGVmZ2hpajA5ODc2NTQzMjFqaWhnZmVkY2Jh
14+
</STREAM>
15+
</BINARY2>
16+
</DATA>
17+
</TABLE>
18+
</RESOURCE>
19+
</VOTABLE>
Collapse file

‎astropy/io/votable/tests/data/binary2_fix_length_multidimension_array_unicodeChar.xml‎

Copy file name to clipboard
+19Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<VOTABLE xmlns="http://www.ivoa.net/xml/VOTable/v1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.4">
3+
<RESOURCE type="results">
4+
<INFO name="QUERY_STATUS" value="OK"/>
5+
<INFO name="QUERY" value="SELECT TOP 1 access_format FROM ivoa.ObsCore"/>
6+
<TABLE>
7+
<FIELD name="access_format" datatype="unicodeChar" arraysize="10x4x2" ucd="meta.code.mime" utype="Access.format">
8+
<DESCRIPTION>Content format of the dataset</DESCRIPTION>
9+
</FIELD>
10+
<DATA>
11+
<BINARY2>
12+
<STREAM encoding="base64">
13+
AABjAGEAZgDpADEAMgAzADQANQA2T2BZfQAxADIAMwA0ADUANgA3ADgDsQOyA7MDtAO1ADEAMgAzADQANQBFAHMAcABhAPEAYQAyADAAMgA1AGMAYQBmAOkAMQAyADMANAA1ADZPYFl9ADEAMgAzADQANQA2ADcAOAOxA7IDswO0A7UAMQAyADMANAA1AEUAcwBwAGEA8QBhADIAMAAyADU=
14+
</STREAM>
15+
</BINARY2>
16+
</DATA>
17+
</TABLE>
18+
</RESOURCE>
19+
</VOTABLE>
Collapse file

‎astropy/io/votable/tests/data/binary2_variable_length_array_char.xml‎

Copy file name to clipboard
+7-7Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<VOTABLE xmlns="http://www.ivoa.net/xml/VOTable/v1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.4">
33
<RESOURCE type="results">
4-
<INFO name="QUERY_STATUS" value="OK" />
5-
<INFO name="QUERY" value="SELECT TOP 1 access_format FROM ivoa.ObsCore" />
4+
<INFO name="QUERY_STATUS" value="OK"/>
5+
<INFO name="QUERY" value="SELECT TOP 1 access_format FROM ivoa.ObsCore"/>
66
<TABLE>
77
<FIELD name="access_format" datatype="char" arraysize="10x*" ucd="meta.code.mime" utype="Access.format">
88
<DESCRIPTION>Content format of the dataset</DESCRIPTION>
99
</FIELD>
1010
<DATA>
11-
<BINARY2>
11+
<BINARY2>
1212
<STREAM encoding="base64">
13-
AAAAAAQxMjM0NTY3ODkwYWJjZGVmZ2hpajA5ODc2NTQzMjFqaWhnZmVkY2Jh
13+
AAAAACgxMjM0NTY3ODkwYWJjZGVmZ2hpajA5ODc2NTQzMjFqaWhnZmVkY2Jh
1414
</STREAM>
15-
</BINARY2>
16-
</DATA>
17-
</TABLE>
15+
</BINARY2>
16+
</DATA>
17+
</TABLE>
1818
</RESOURCE>
1919
</VOTABLE>
Collapse file

‎astropy/io/votable/tests/data/binary2_variable_length_array_unicodeChar.xml‎

Copy file name to clipboard
+19Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<VOTABLE xmlns="http://www.ivoa.net/xml/VOTable/v1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.4">
3+
<RESOURCE type="results">
4+
<INFO name="QUERY_STATUS" value="OK"/>
5+
<INFO name="QUERY" value="SELECT TOP 1 access_format FROM ivoa.ObsCore"/>
6+
<TABLE>
7+
<FIELD name="access_format" datatype="unicodeChar" arraysize="10x*" ucd="meta.code.mime" utype="Access.format">
8+
<DESCRIPTION>Content format of the dataset</DESCRIPTION>
9+
</FIELD>
10+
<DATA>
11+
<BINARY2>
12+
<STREAM encoding="base64">
13+
AAAAACgAYwBhAGYA6QAxADIAMwA0ADUANk9gWX0AMQAyADMANAA1ADYANwA4A7EDsgOzA7QDtQAxADIAMwA0ADUARQBzAHAAYQDxAGEAMgAwADIANQ==
14+
</STREAM>
15+
</BINARY2>
16+
</DATA>
17+
</TABLE>
18+
</RESOURCE>
19+
</VOTABLE>
Collapse file

‎astropy/io/votable/tests/data/binary2_variable_length_multidimension_array_char.xml‎

Copy file name to clipboard
+19Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<VOTABLE xmlns="http://www.ivoa.net/xml/VOTable/v1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.4">
3+
<RESOURCE type="results">
4+
<INFO name="QUERY_STATUS" value="OK"/>
5+
<INFO name="QUERY" value="SELECT TOP 1 access_format FROM ivoa.ObsCore"/>
6+
<TABLE>
7+
<FIELD name="access_format" datatype="char" arraysize="10x4x*" ucd="meta.code.mime" utype="Access.format">
8+
<DESCRIPTION>Content format of the dataset</DESCRIPTION>
9+
</FIELD>
10+
<DATA>
11+
<BINARY2>
12+
<STREAM encoding="base64">
13+
AAAAAFAxMjM0NTY3ODkwYWJjZGVmZ2hpajA5ODc2NTQzMjFqaWhnZmVkY2JhMTIzNDU2Nzg5MGFiY2RlZmdoaWowOTg3NjU0MzIxamloZ2ZlZGNiYQ==
14+
</STREAM>
15+
</BINARY2>
16+
</DATA>
17+
</TABLE>
18+
</RESOURCE>
19+
</VOTABLE>

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.