Skip to content

Commit 34edf0d

Browse files
ndp-opendapndp-opendap
authored
Revert dmrVersion change "Jhrg/hyrax-1963 dmr version bump (#320)" (#355)
* Revert "Jhrg/hyrax-1963 dmr version bump (#320)" This reverts commit e3bf0b3. * Force D4ParserSax2 to always set dmrVersion="1.0" earn parsing a DMR
1 parent 9b0e1e0 commit 34edf0d

458 files changed

Lines changed: 772 additions & 774 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎D4ParserSax2.cc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -649,7 +649,8 @@ void D4ParserSax2::dmr_start_element(void *p, const xmlChar *l, const xmlChar *p
649649
parser->dmr()->set_dap_version(parser->xml_attrs["dapVersion"].value);
650650

651651
if (parser->check_attribute("dmrVersion"))
652-
parser->dmr()->set_dmr_version(parser->xml_attrs["dmrVersion"].value);
652+
parser->dmr()->set_dmr_version("1.0");
653+
// parser->dmr()->set_dmr_version(parser->xml_attrs["dmrVersion"].value);
653654

654655
if (parser->check_attribute("base"))
655656
parser->dmr()->set_request_xml_base(parser->xml_attrs["base"].value);

‎DMR.h‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class XMLWriter;
4646

4747
class DDS;
4848

49-
/** DMR is the root object for a DAP4 dataset. It holds a D4Group and other
49+
/** DMR is root object for a DAP4 dataset. It holds a D4Group and other
5050
* information about the dataset (DAP protocol number, DMR version, etc.).
5151
*
5252
* @note This class holds the dataset name and filename (which might
@@ -60,7 +60,7 @@ class DMR : public DapObj {
6060

6161
/// The name of the dataset. This should not be the pathname to a file
6262
std::string d_name;
63-
/// The pathname or another system identifier for the dataset
63+
/// The pathname or other system identifier for the dataset
6464
std::string d_filename;
6565

6666
/// DAP protocol major version number. Should be '4'
@@ -71,10 +71,7 @@ class DMR : public DapObj {
7171
std::string d_dap_version = "4.0";
7272

7373
/// The version of the DMR document
74-
/// Version 1.0 is the original serialization scheme - Groups were serialized first,
75-
/// then the top-level variables.
76-
/// The 2.0 version indicates the DAP4 Serialization bug fix.
77-
std::string d_dmr_version = "2.0";
74+
std::string d_dmr_version = "1.0";
7875

7976
/// The URL for the request base
8077
std::string d_request_xml_base;

‎tests/dmr-testsuite/big-endian/test_array_1.xml.1.func_base‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
Parse successful
22
<?xml version="1.0" encoding="ISO-8859-1"?>
3-
<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_1.xml" dapVersion="4.0" dmrVersion="2.0" name="test_array_1">
3+
<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_1">
44
<Int32 name="x">
55
<Dim size="5"/>
66
</Int32>
77
</Dataset>
88

99
<?xml version="1.0" encoding="ISO-8859-1"?>
10-
<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="2.0" name="function_results">
10+
<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
1111
<Float64 name="x">
1212
<Dim size="5"/>
1313
<Attribute name="DAP4_Checksum_CRC32" type="String">

‎tests/dmr-testsuite/big-endian/test_array_1.xml.2.func_base‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
Parse successful
22
<?xml version="1.0" encoding="ISO-8859-1"?>
3-
<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_1.xml" dapVersion="4.0" dmrVersion="2.0" name="test_array_1">
3+
<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_1">
44
<Int32 name="x">
55
<Dim size="5"/>
66
</Int32>
77
</Dataset>
88

99
<?xml version="1.0" encoding="ISO-8859-1"?>
10-
<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="2.0" name="function_results">
10+
<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
1111
<Float64 name="x">
1212
<Dim size="5"/>
1313
<Attribute name="DAP4_Checksum_CRC32" type="String">

‎tests/dmr-testsuite/big-endian/test_array_1.xml.3.func_base‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
Parse successful
22
<?xml version="1.0" encoding="ISO-8859-1"?>
3-
<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_1.xml" dapVersion="4.0" dmrVersion="2.0" name="test_array_1">
3+
<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_1">
44
<Int32 name="x">
55
<Dim size="5"/>
66
</Int32>
77
</Dataset>
88

99
<?xml version="1.0" encoding="ISO-8859-1"?>
10-
<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="2.0" name="function_results">
10+
<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
1111
<Float64 name="x">
1212
<Dim size="5"/>
1313
<Attribute name="DAP4_Checksum_CRC32" type="String">

‎tests/dmr-testsuite/big-endian/test_array_1.xml.4.func_base‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
Parse successful
22
<?xml version="1.0" encoding="ISO-8859-1"?>
3-
<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_1.xml" dapVersion="4.0" dmrVersion="2.0" name="test_array_1">
3+
<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_1">
44
<Int32 name="x">
55
<Dim size="5"/>
66
</Int32>
77
</Dataset>
88

99
<?xml version="1.0" encoding="ISO-8859-1"?>
10-
<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="2.0" name="function_results">
10+
<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
1111
<Float64 name="x">
1212
<Dim size="5"/>
1313
<Attribute name="DAP4_Checksum_CRC32" type="String">

‎tests/dmr-testsuite/big-endian/test_array_1.xml.5.func_base‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
Parse successful
22
<?xml version="1.0" encoding="ISO-8859-1"?>
3-
<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_1.xml" dapVersion="4.0" dmrVersion="2.0" name="test_array_1">
3+
<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_1">
44
<Int32 name="x">
55
<Dim size="5"/>
66
</Int32>
77
</Dataset>
88

99
<?xml version="1.0" encoding="ISO-8859-1"?>
10-
<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="2.0" name="function_results">
10+
<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
1111
<Float64 name="x">
1212
<Dim size="5"/>
1313
<Attribute name="DAP4_Checksum_CRC32" type="String">

‎tests/dmr-testsuite/big-endian/test_array_1.xml.6.func_base‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
Parse successful
22
<?xml version="1.0" encoding="ISO-8859-1"?>
3-
<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_1.xml" dapVersion="4.0" dmrVersion="2.0" name="test_array_1">
3+
<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_1">
44
<Int32 name="x">
55
<Dim size="5"/>
66
</Int32>
77
</Dataset>
88

99
<?xml version="1.0" encoding="ISO-8859-1"?>
10-
<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="2.0" name="function_results">
10+
<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
1111
<Float64 name="x">
1212
<Dim size="5"/>
1313
<Attribute name="DAP4_Checksum_CRC32" type="String">

‎tests/dmr-testsuite/big-endian/test_array_1.xml.7.func_base‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
Parse successful
22
<?xml version="1.0" encoding="ISO-8859-1"?>
3-
<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_1.xml" dapVersion="4.0" dmrVersion="2.0" name="test_array_1">
3+
<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_1">
44
<Int32 name="x">
55
<Dim size="5"/>
66
</Int32>
77
</Dataset>
88

99
<?xml version="1.0" encoding="ISO-8859-1"?>
10-
<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="2.0" name="function_results">
10+
<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" dapVersion="4.0" dmrVersion="1.0" name="function_results">
1111
<Float64 name="x">
1212
<Dim size="5"/>
1313
<Attribute name="DAP4_Checksum_CRC32" type="String">

‎tests/dmr-testsuite/big-endian/test_array_1.xml.intern_base‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
Parse successful
22
<?xml version="1.0" encoding="ISO-8859-1"?>
3-
<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_1.xml" dapVersion="4.0" dmrVersion="2.0" name="test_array_1">
3+
<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_1">
44
<Int32 name="x">
55
<Dim size="5"/>
66
</Int32>
77
</Dataset>
88

99
<?xml version="1.0" encoding="ISO-8859-1"?>
10-
<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_1.xml" dapVersion="4.0" dmrVersion="2.0" name="test_array_1">
10+
<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_1.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_1">
1111
<Int32 name="x">
1212
<Dim size="5"/>
1313
</Int32>

0 commit comments

Comments
 (0)
⚡