Fix any: qualifier when searching.

diff --git a/src/cx/fbn/nevernote/sql/REnSearch.java b/src/cx/fbn/nevernote/sql/REnSearch.java
index 1da5abe..ebbbaaf 100644 (file)
--- a/src/cx/fbn/nevernote/sql/REnSearch.java
+++ b/src/cx/fbn/nevernote/sql/REnSearch.java
@@ -115,8 +115,7 @@ public class REnSearch {
        public List<String> getStack() { return stack; }\r
 \r
        // match tag names\r
-       private boolean matchTagsAll(List<String> tagNames) {\r
-               List<String> list = getTags();\r
+       private boolean matchTagsAll(List<String> tagNames, List<String> list) {\r
                                \r
                for (int j=0; j<list.size(); j++) {\r
                        boolean negative = false;\r
@@ -147,8 +146,7 @@ public class REnSearch {
        }\r
        \r
        // match tag names\r
-       private boolean matchTagsAny(List<String> tagNames) {\r
-               List<String> list = getTags();\r
+       private boolean matchTagsAny(List<String> tagNames, List<String> list) {\r
                if (list.size() == 0)\r
                        return true;\r
                \r
@@ -178,6 +176,7 @@ public class REnSearch {
                        return found;\r
        }\r
        \r
+       \r
        // Match notebooks in search terms against notes\r
        private boolean matchNotebook(String guid) {\r
                if (getNotebooks().size() == 0)\r
@@ -764,7 +763,7 @@ public class REnSearch {
                                                \r
                        // Start matching special stuff, like tags & notebooks\r
                        if (any) {\r
-                               if (good && !matchTagsAny(n.getTagNames()))\r
+                               if (good && !matchTagsAny(n.getTagNames(), getTags()))\r
                                        good = false;\r
                                if (good && !matchNotebook(n.getNotebookGuid()))\r
                                        good = false;\r
@@ -787,7 +786,7 @@ public class REnSearch {
                                if (good && n.getAttributes() != null && !matchDatesAny(getSubjectDate(), n.getAttributes().getSubjectDate()))\r
                                        good = false;\r
                        } else {\r
-                               if (good && !matchTagsAll(n.getTagNames()))\r
+                               if (good && !matchTagsAll(n.getTagNames(), getTags()))\r
                                        good = false;\r
                                if (good && !matchNotebook(n.getNotebookGuid()))\r
                                        good = false;\r