dominic/YSFClients
1
0
Fork 0
Code Releases Activity

fix wiresx search, avoid listing same reflector multiple times

Browse source 
if match occurs multiple times along reflector name... and a bit of code cleanup...
This commit is contained in:
narspt 2020-02-26 07:16:02 +00:00 committed by GitHub
parent 0e018f1676
commit 5d6554c211
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
YSFGateway/YSFReflectors.cpp
View file

@ -313,19 +313,17 @@ std::vector<CYSFReflector*>& CYSFReflectors::search(const std::string& name)
reflector.erase(std::find_if(reflector.rbegin(), reflector.rend(), std::not1(std::ptr_fun<int, int>(std::isspace))).base(), reflector.end());
std::transform(reflector.begin(), reflector.end(), reflector.begin(), ::toupper);
// Origional match function - only matches start of string.
// Original match function - only matches start of string.
// if (trimmed == reflector.substr(0U, len))
// m_search.push_back(*it);
// m_search.push_back(*it);
// New match function searches the whole string
unsigned int refSrcPos;
for (refSrcPos=0;refSrcPos<reflector.length(); refSrcPos++)
{
if (reflector.substr(refSrcPos,trimmed.length()) == trimmed)
{
m_search.push_back(*it);
}
}
for (unsigned int refSrcPos = 0U; refSrcPos < reflector.length(); refSrcPos++) {
if (reflector.substr(refSrcPos, trimmed.length()) == trimmed) {
m_search.push_back(*it);
break;
}
}
}
std::sort(m_search.begin(), m_search.end(), refComparison);