Skip to content

Fix illegal characters in resolved XML output #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DavidKelly-MDA wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix illegal characters in resolved XML output #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tools/eds/cfecfs/edsmsg/eds/cfe_hdr.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<ContainerDataType name="CommandHeader" baseType="Message" shortDescription="Complete Command Packet Header">
<ConstraintSet>
<ValueConstraint entry="CCSDS.SecHdrFlags" value="Cmd" />
</ConstraintSet>-->
</ConstraintSet>
<EntryList>
<Entry name="Sec" type="CmdSecHdr" shortDescription="Command Secondary Header" />
</EntryList>
Expand All @@ -88,7 +88,7 @@
<ContainerDataType name="TelemetryHeader" baseType="Message" shortDescription="Complete Telemetry Packet Header">
<ConstraintSet>
<ValueConstraint entry="CCSDS.SecHdrFlags" value="Tlm" />
</ConstraintSet>-->
</ConstraintSet>
<EntryList>
<Entry name="Sec" type="TlmSecHdr" shortDescription="Telemetry Secondary Header" />
</EntryList>
Expand Down
5 changes: 5 additions & 0 deletions tools/eds/tool/scripts/85-seds_write_resolved_xml.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,11 @@ local function write_node(output,node,name_prefix)
attrval = string.format("%g",attrval)
end
end
if (type(attrval) == "string") then
attrval = attrval:gsub("&", "&amp;")
attrval = attrval:gsub("<", "&lt;")
attrval = attrval:gsub(">", "&gt;")
end
my_attrs = string.format("%s %s=\"%s\"",my_attrs, node.xml_attrname[attr], tostring(attrval))
end
local cdata = ""
Expand Down