From b9b72fd791a2d24d2b5b561d247eb88b7d2ff74e Mon Sep 17 00:00:00 2001
From: Randy Baumgarte <randy@fbn.cx>
Date: Tue, 20 Mar 2012 09:56:47 -0400
Subject: [PATCH] Correct issues with searching not showing the correct
 results.

---
 src/cx/fbn/nevernote/sql/REnSearch.java | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/cx/fbn/nevernote/sql/REnSearch.java b/src/cx/fbn/nevernote/sql/REnSearch.java
index cec989a..7534d6b 100644
--- a/src/cx/fbn/nevernote/sql/REnSearch.java
+++ b/src/cx/fbn/nevernote/sql/REnSearch.java
@@ -130,13 +130,16 @@ public class REnSearch {
 			if (tagNames.size() == 0 && !negative)
 				return false;
 			
+			boolean matchFound = false;
 			for (int i=0; i<tagNames.size(); i++) {	
 				boolean matches = Pattern.matches(filterName.toLowerCase(),tagNames.get(i).toLowerCase());
-				if (!matches && !negative)
-					return false;
-				if (matches && negative)
-					return false;
+				if (matches)
+					matchFound = true;
 			}
+			if (negative) 
+				matchFound = !matchFound;
+			if (!matchFound) 
+				return false;
 		}
 		return true;
 	}
@@ -541,7 +544,7 @@ public class REnSearch {
  				return false;
 			boolean returnTodo = false;
 			while (pos > -1) {
-				int endPos = n.getContent().indexOf("/>", pos);
+				int endPos = n.getContent().indexOf(">", pos);
 				String segment = n.getContent().substring(pos, endPos);
 				boolean currentState;
 				if (segment.toLowerCase().indexOf("checked=\"true\"") == -1)
-- 
2.11.0