Skip to content

Commit

Permalink
Namespaced xml (#69)
Browse files Browse the repository at this point in the history
* handle reading of namespaced xml OEM

* Update setup.py

removed check of CI_COMMIT_TAG env variable

* Update setup.py

reverting to the original setup.py
  • Loading branch information
TommasoPino committed Dec 8, 2021
1 parent 0b6567a commit f5af694
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion oem/components/data.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ def _from_xml(cls, segment, version, metadata):
states = [
State._from_xml(entry, version, metadata)
for entry in segment
if entry.tag != "COMMENT"
if entry.tag.rpartition('}')[-1] != "COMMENT"
]
return cls(states, version=version)

Expand Down
4 changes: 2 additions & 2 deletions oem/components/header.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ def _from_string(cls, segment):
def _from_xml(cls, segment):
header_segment = list(segment)[0]
fields = {
entry.tag: entry.text
entry.tag.rpartition('}')[-1]: entry.text
for entry in header_segment
if entry.tag != "COMMENT"
if entry.tag.rpartition('}')[-1] != "COMMENT"
}
fields["CCSDS_OEM_VERS"] = segment.attrib["version"]
return cls(fields)
Expand Down
4 changes: 2 additions & 2 deletions oem/components/metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,9 @@ def _from_string(cls, segment, version):
@classmethod
def _from_xml(cls, segment, version):
metadata = {
entry.tag: entry.text
entry.tag.rpartition('}')[-1]: entry.text
for entry in segment
if entry.tag != "COMMENT"
if entry.tag.rpartition('}')[-1] != "COMMENT"
}
return cls(metadata, version=version)

Expand Down
4 changes: 2 additions & 2 deletions oem/components/segment.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,15 +125,15 @@ def _from_xml(cls, segment, version):
state_data = DataSection._from_xml(
[
entry for entry in segment[1]
if entry.tag == "stateVector"
if entry.tag.rpartition('}')[-1] == "stateVector"
],
version,
metadata
)

raw_covariances = [
entry for entry in segment[1]
if entry.tag == "covarianceMatrix"
if entry.tag.rpartition('}')[-1] == "covarianceMatrix"
]
if raw_covariances:
covariance_data = CovarianceSection._from_xml(
Expand Down
4 changes: 2 additions & 2 deletions oem/components/types.py
Original file line number Diff line number Diff line change
Expand Up @@ -257,8 +257,8 @@ def _from_string(cls, segment, version, metadata):

@classmethod
def _from_xml(cls, segment, version, metadata):
parts = [entry for entry in segment if entry.tag != "COMMENT"]
entries = {entry.tag: entry.text for entry in parts}
parts = [entry for entry in segment if entry.tag.rpartition('}')[-1] != "COMMENT"]
entries = {entry.tag.rpartition('}')[-1]: entry.text for entry in parts}
if "EPOCH" not in entries:
raise ValueError("Covariance entry missing keyword 'EPOCH'")
else:
Expand Down

0 comments on commit f5af694

Please sign in to comment.