FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Package: fix detection of unknown filter term.

Browse Source
This commit is contained in:
Thomas Geymayer 2014-06-11 18:18:18 +02:00
parent 49fc75926e
commit 97cc250047
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
simgear/package/Package.cxx
View File

@ -53,7 +53,9 @@ bool Package::matches(const SGPropertyNode* aFilter) const
int nChildren = aFilter->nChildren(); int nChildren = aFilter->nChildren();
for (int i = 0; i < nChildren; i++) { for (int i = 0; i < nChildren; i++) {
const SGPropertyNode* c = aFilter->getChild(i); const SGPropertyNode* c = aFilter->getChild(i);
if (strutils::starts_with(c->getName(), "rating-")) { const std::string& filter_name = c->getNameString();
if (strutils::starts_with(filter_name, "rating-")) {
int minRating = c->getIntValue(); int minRating = c->getIntValue();
std::string rname = c->getName() + 7; std::string rname = c->getName() + 7;
int ourRating = m_props->getChild("rating")->getIntValue(rname, 0); int ourRating = m_props->getChild("rating")->getIntValue(rname, 0);
@ -61,17 +63,15 @@ bool Package::matches(const SGPropertyNode* aFilter) const
return false; return false;
} }
} }
else if (filter_name == "tag") {
if (strcmp(c->getName(), "tag") == 0) {
std::string tag(c->getStringValue()); std::string tag(c->getStringValue());
boost::to_lower(tag); boost::to_lower(tag);
if (m_tags.find(tag) == m_tags.end()) { if (m_tags.find(tag) == m_tags.end()) {
return false; return false;
} }
} }
// substring search of name, description // substring search of name, description
if (strcmp(c->getName(), "name") == 0) { else if (filter_name == "name") {
std::string n(c->getStringValue()); std::string n(c->getStringValue());
boost::to_lower(n); boost::to_lower(n);
size_t pos = boost::to_lower_copy(name()).find(n); size_t pos = boost::to_lower_copy(name()).find(n);
@ -79,8 +79,7 @@ bool Package::matches(const SGPropertyNode* aFilter) const
return false; return false;
} }
} }
else if (filter_name == "description") {
if (strcmp(c->getName(), "description") == 0) {
std::string n(c->getStringValue()); std::string n(c->getStringValue());
boost::to_lower(n); boost::to_lower(n);
size_t pos = boost::to_lower_copy(description()).find(n); size_t pos = boost::to_lower_copy(description()).find(n);
@ -88,8 +87,8 @@ bool Package::matches(const SGPropertyNode* aFilter) const
return false; return false;
} }
} }
else
SG_LOG(SG_GENERAL, SG_WARN, "unknown filter term:" << c->getName()); SG_LOG(SG_GENERAL, SG_WARN, "unknown filter term:" << filter_name);
} // of filter props iteration } // of filter props iteration
return true; return true;