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

Bug Fix - #252

Browse Source 
- Fixed bug that prevented using end.after: and end.before: together
  to effect a range.
- Required differentiation between positive and negative attribute
  modifiers, and special handling.
This commit is contained in:
Paul Beckingham
2009-08-16 13:01:28 -04:00
parent f595bc4731
commit 79f59f12ae
3 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/Filter.cpp
View File

@@ -25,6 +25,7 @@
//
////////////////////////////////////////////////////////////////////////////////
#include <iostream> // TODO Remove
#include <sstream>
#include "Filter.h"
#include "util.h"
@@ -40,34 +41,33 @@ bool Filter::pass (const Record& record) const
// First do description/annotation matches.
foreach (att, (*this))
{
// Descriptions have special handling.
// 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.
if (att->name () == "description")
{
bool description_result = true;
bool annotation_result = true;
if ((r = record.find (att->name ())) != record.end ())
{
// A description match failure can be salvaged by an annotation match.
if (! att->match (r->second))
{
bool annoMatch = false;
foreach (ra, record)
{
if (ra->first.length () > 11 &&
ra->first.substr (0, 11) == "annotation_")
{
if (att->match (ra->second))
{
annoMatch = true;
break;
}
}
}
description_result = att->match (r->second);
if (!annoMatch)
return false;
foreach (ra, record)
{
if (ra->first.length () > 11 &&
ra->first.substr (0, 11) == "annotation_")
annotation_result = annotation_result && att->match (ra->second);
}
}
else if (! att->match (Att ()))
return false;
if (att->modType (att->mod ()) == "positive")
return description_result && annotation_result;
return description_result || annotation_result;
}
// Annotations are skipped, because they are handled above.