From 8086b39e11da344f9c931ea8d325d2ef94982913 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Thu, 13 Nov 2014 12:45:32 -0800 Subject: Adjust the counter function for filter with "none of the above" So this should count dives with neither buddy nor divemaster, without a location, with no tags, etc. Signed-off-by: Dirk Hohndel --- dive.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'dive.c') diff --git a/dive.c b/dive.c index 5705921fc..126453bed 100644 --- a/dive.c +++ b/dive.c @@ -2507,8 +2507,13 @@ int count_dives_with_tag(const char *tag) struct dive *d; for_each_dive (i, d) { - if (taglist_contains(d->tag_list, tag)) + if (same_string(tag, "")) { + // count dives with no tags + if (d->tag_list == NULL) + counter++; + } else if (taglist_contains(d->tag_list, tag)) { counter++; + } } return counter; } @@ -2522,8 +2527,13 @@ int count_dives_with_person(const char *person) struct dive *d; for_each_dive (i, d) { - if (string_sequence_contains(d->buddy, person) || string_sequence_contains(d->divemaster, person)) + if (same_string(person, "")) { + // solo dive + if (same_string(d->buddy, "") && same_string(d->divemaster, "")) + counter++; + } else if (string_sequence_contains(d->buddy, person) || string_sequence_contains(d->divemaster, person)) { counter++; + } } return counter; } -- cgit v1.2.3-70-g09d2