Skip to content

Add dependency conversion for model.config's #91

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

Merged
JShep1 merged 4 commits into from
Oct 22, 2020
Merged

Add dependency conversion for model.config's #91

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2501c06
Add conversion for dependency in model.config
Oct 7, 2020
02c3624
Remove comment
Oct 7, 2020
bbb4b33
Add conversion other way
Oct 8, 2020
aaec9fb
Merge branch 'ign-msgs5' into jshep1/add_dependency_conversion
Oct 21, 2020
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
27 changes: 27 additions & 0 deletions src/Utility.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1010,6 +1010,23 @@ namespace ignition
if (elem && elem->GetText())
meta.set_description(trimmed(elem->GetText()));

// Read the dependencies, if any.
elem = modelElement->FirstChildElement("depend");
while (elem)
{
auto modelElem = elem->FirstChildElement("model");
if (modelElem)
{
auto uriElem = modelElem->FirstChildElement("uri");
if (uriElem)
{
auto dependency = meta.add_dependencies();
dependency->set_uri(uriElem->GetText());
}
}
elem = elem->NextSiblingElement("depend");
}

// Read the authors, if any.
elem = modelElement->FirstChildElement("author");
while (elem)
Expand Down Expand Up @@ -1114,6 +1131,16 @@ namespace ignition
<< " </author>\n";
}

// Output dependency information.
for (int i = 0; i < _meta.dependencies_size(); ++i)
{
out << " <depend>\n"
<< " <model>"
<< " <uri>" << _meta.dependencies(i).uri() << "</uri>\n"
<< " </model>"
<< " </depend>\n";
}

// Output closing tag.
if (_meta.has_model())
out << " </model>\n";
Expand Down