GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-07-07 20:06:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Variant

Browse source 
- The ::operator_match (and by extension operator_nomatch) now obey the rc.regex
  setting.
This commit is contained in:
Paul Beckingham 2014-09-28 13:39:50 -04:00
parent 9e0ea1cb4a
commit dcc5dbf16a
3 changed files with 45 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/Variant.cpp
View file

@ -39,6 +39,7 @@
std::string Variant::dateFormat = "";
bool Variant::searchCaseSensitive = true;
bool Variant::searchUsingRegex = true;
////////////////////////////////////////////////////////////////////////////////
Variant::Variant ()
@ -913,21 +914,42 @@ bool Variant::operator_match (const Variant& other, const Task& task) const
left.cast (type_string);
right.cast (type_string);
RX r (right._string, searchCaseSensitive);
if (r.match (left._string))
return true;
// If the above did not match, and the left source is "description", then
// in the annotations.
if (left.source () == "description")
if (searchUsingRegex)
{
std::map <std::string, std::string> annotations;
task.getAnnotations (annotations);
RX r (right._string, searchCaseSensitive);
if (r.match (left._string))
return true;
std::map <std::string, std::string>::iterator a;
for (a = annotations.begin (); a != annotations.end (); ++a)
if (r.match (a->second))
return true;
// If the above did not match, and the left source is "description", then
// in the annotations.
if (left.source () == "description")
{
std::map <std::string, std::string> annotations;
task.getAnnotations (annotations);
std::map <std::string, std::string>::iterator a;
for (a = annotations.begin (); a != annotations.end (); ++a)
if (r.match (a->second))
return true;
}
}
else
{
if (find (left._string, right._string, searchCaseSensitive) != std::string::npos)
return true;
// If the above did not match, and the left source is "description", then
// in the annotations.
if (left.source () == "description")
{
std::map <std::string, std::string> annotations;
task.getAnnotations (annotations);
std::map <std::string, std::string>::iterator a;
for (a = annotations.begin (); a != annotations.end (); ++a)
if (find (a->second, right._string, searchCaseSensitive) != std::string::npos)
return true;
}
}
return false;