Upgrade apache & evernote libraries

[neighbornote/NeighborNote.git] / src / cx / fbn / nevernote / sql / REnSearch.java

diff --git a/src/cx/fbn/nevernote/sql/REnSearch.java b/src/cx/fbn/nevernote/sql/REnSearch.java
index 70eae3e..abb6c85 100644 (file)
--- a/src/cx/fbn/nevernote/sql/REnSearch.java
+++ b/src/cx/fbn/nevernote/sql/REnSearch.java
@@ -27,7 +27,7 @@ import java.util.GregorianCalendar;
 import java.util.List;\r
 import java.util.regex.Pattern;\r
 \r
-import org.apache.commons.lang.StringEscapeUtils;\r
+import org.apache.commons.lang3.StringEscapeUtils;\r
 \r
 import com.evernote.edam.type.Note;\r
 import com.evernote.edam.type.Notebook;\r
@@ -249,7 +249,7 @@ public class REnSearch {
                n = conn.getNoteTable().getNote(n.getGuid(), true, true, false, false, false);\r
 \r
                // Check for search phrases\r
-               String text = StringEscapeUtils.unescapeHtml(n.getContent().replaceAll("\\<.*?\\>", "")).toLowerCase();\r
+               String text = StringEscapeUtils.unescapeHtml4(n.getContent().replaceAll("\\<.*?\\>", "")).toLowerCase();\r
                boolean negative = false;\r
                for (int i=0; i<searchPhrases.size(); i++) {\r
                        String phrase = searchPhrases.get(i);\r
@@ -512,7 +512,7 @@ public class REnSearch {
                n = conn.getNoteTable().getNote(n.getGuid(), true, true, false, false, false);\r
                \r
                // Check for search phrases\r
-               String text = StringEscapeUtils.unescapeHtml(n.getContent().replaceAll("\\<.*?\\>", "")).toLowerCase();\r
+               String text = StringEscapeUtils.unescapeHtml4(n.getContent().replaceAll("\\<.*?\\>", "")).toLowerCase();\r
                boolean negative = false;\r
                for (int i=0; i<searchPhrases.size(); i++) {\r
                        String phrase = searchPhrases.get(i);\r