Add check for length = 0 on recognition in highlight checking.

[neighbornote/NeighborNote.git] / src / cx / fbn / nevernote / xml / NoteFormatter.java

diff --git a/src/cx/fbn/nevernote/xml/NoteFormatter.java b/src/cx/fbn/nevernote/xml/NoteFormatter.java
index 121ca5a..d513322 100644 (file)
--- a/src/cx/fbn/nevernote/xml/NoteFormatter.java
+++ b/src/cx/fbn/nevernote/xml/NoteFormatter.java
@@ -132,6 +132,8 @@ public class NoteFormatter {
                \r
                // Get the recognition XML that tells where to hilight on the image\r
                Resource recoResource = conn.getNoteTable().noteResourceTable.getNoteResourceRecognition(resGuid);\r
+               if (recoResource.getRecognition().getBody() == null || recoResource.getRecognition().getBody().length == 0)\r
+                       return;\r
                QByteArray recoData = new QByteArray(recoResource.getRecognition().getBody());\r
                String xml = recoData.toString();\r
                \r
@@ -172,7 +174,12 @@ public class NoteFormatter {
                                        \r
                                        // Check to see if this word matches something we were searching for.\r
                                        for (int k=0; k<enSearch.hilightWords.size(); k++) {\r
-                                               if (enSearch.hilightWords.get(k).equalsIgnoreCase(text))\r
+                                               String searchWord = enSearch.hilightWords.get(k).toLowerCase();\r
+                                               if (searchWord.startsWith("*"))\r
+                                                       searchWord = searchWord.substring(1);\r
+                                               if (searchWord.endsWith("*"))\r
+                                                       searchWord = searchWord.substring(0,searchWord.length()-1);\r
+                                               if (text.toLowerCase().contains(searchWord))\r
                                                        p2.drawRect(x,y,w,h);                           \r
                                        }\r
                                }\r