gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Enhancement - caseless compare

Browse Source 
- Fixed bug detecting multiple failed negative attribute matches.
This commit is contained in:
Paul Beckingham
2010-01-27 16:52:54 -05:00
parent 4f1183a358
commit b1700f3cf6
3 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Filter.cpp
View File

@@ -42,17 +42,22 @@ bool Filter::pass (const Record& record) const
{
// Descriptions have special handling such that they are linked to
// annotations, and filtering on description implies identical filtering
// on annotations, and that both filter matches must succeed for the filter
// to succeed overall.
// on annotations.
//
// For positive modifiers (has, is ...) either the description or the
// annotation filter must succeed.
//
// For negative modifiers (hasnt, isnt ...) both the description and the
// annotation filter must succeed.
if (att->name () == "description")
{
bool description_result = true;
bool pass = true;
int annotation_pass_count = 0;
int annotation_fail_count = 0;
if ((r = record.find (att->name ())) != record.end ())
{
description_result = att->match (r->second);
pass = att->match (r->second);
foreach (ra, record)
{
@@ -66,6 +71,8 @@ bool Filter::pass (const Record& record) const
}
}
}
// Missing attribute implies failure.
else if (! att->match (Att ()))
return false;
@@ -74,12 +81,12 @@ bool Filter::pass (const Record& record) const
// are willing to invest a week understanding and testing it.
if (att->modType (att->mod ()) == "positive")
{
if (! (description_result || annotation_pass_count > 0))
if (! (pass || annotation_pass_count))
return false;
}
else
{
if (!description_result || annotation_fail_count > 0)
if (! (pass && annotation_fail_count == 0))
return false;
}
}