From 1bcc234debd230268ff1078a2ed7f0151e0cf08c Mon Sep 17 00:00:00 2001
From: Randy Baumgarte <randy@fbn.cx>
Date: Sun, 19 Dec 2010 15:03:43 -0500
Subject: [PATCH] Fix hilight image with wild cards.

---
 src/cx/fbn/nevernote/NeverNote.java         | 5 +++--
 src/cx/fbn/nevernote/xml/NoteFormatter.java | 9 ++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/cx/fbn/nevernote/NeverNote.java b/src/cx/fbn/nevernote/NeverNote.java
index 30a200c..87e91fd 100644
--- a/src/cx/fbn/nevernote/NeverNote.java
+++ b/src/cx/fbn/nevernote/NeverNote.java
@@ -2508,6 +2508,9 @@ public class NeverNote extends QMainWindow{
 	// otherwise we trigger off searchFieldChanged.
 	@SuppressWarnings("unused")
 	private void searchFieldTextChanged(String text) {
+		QWebSettings.setMaximumPagesInCache(0);
+		QWebSettings.setObjectCacheCapacities(0, 0, 0);
+
 		if (text.trim().equals("")) {
 			searchFieldCleared();
 			if (searchPerformed) {
@@ -2517,8 +2520,6 @@ public class NeverNote extends QMainWindow{
 				noteCache.clear();
 				readOnlyCache.clear();
 				inkNoteCache.clear();
-				QWebSettings.setMaximumPagesInCache(0);
-				QWebSettings.setObjectCacheCapacities(0, 0, 0);
 				
 				listManager.setEnSearch("");
 				listManager.loadNotesIndex();
diff --git a/src/cx/fbn/nevernote/xml/NoteFormatter.java b/src/cx/fbn/nevernote/xml/NoteFormatter.java
index 121ca5a..922777f 100644
--- a/src/cx/fbn/nevernote/xml/NoteFormatter.java
+++ b/src/cx/fbn/nevernote/xml/NoteFormatter.java
@@ -132,6 +132,8 @@ public class NoteFormatter {
 		
 		// Get the recognition XML that tells where to hilight on the image
 		Resource recoResource = conn.getNoteTable().noteResourceTable.getNoteResourceRecognition(resGuid);
+		if (recoResource.getRecognition().getBody() == null)
+			return;
 		QByteArray recoData = new QByteArray(recoResource.getRecognition().getBody());
 		String xml = recoData.toString();
 		
@@ -172,7 +174,12 @@ public class NoteFormatter {
 		    			
 		    			// Check to see if this word matches something we were searching for.
 		    			for (int k=0; k<enSearch.hilightWords.size(); k++) {
-		    				if (enSearch.hilightWords.get(k).equalsIgnoreCase(text))
+		    				String searchWord = enSearch.hilightWords.get(k).toLowerCase();
+		    				if (searchWord.startsWith("*"))
+		    					searchWord = searchWord.substring(1);
+		    				if (searchWord.endsWith("*"))
+		    					searchWord = searchWord.substring(0,searchWord.length()-1);
+		    				if (text.toLowerCase().contains(searchWord))
 		    					p2.drawRect(x,y,w,h);				
 		    			}
 		    		}
-- 
2.11.0