Changeset 13054

Timestamp:

2006-10-09T13:20:00+13:00 (18 years ago)

Author:

mdewsnip

Message:

Now puts the terms through xmlSafe() as well, to prevent invalid XML with weird terms containing punctuation.

Location:

trunk

Files:

• gsdl/bin/java/LuceneWrap.jar (modified) ( previous)
• gsdl/src/java/org/nzdl/gsdl/LuceneWrap/GS2LuceneQuery.java (modified) (2 diffs)
• indexers/lucene-gs/src/org/greenstone/LuceneWrapper/GS2LuceneQuery.java (modified) (2 diffs)

trunk/gsdl/src/java/org/nzdl/gsdl/LuceneWrap/GS2LuceneQuery.java

@@ -225 +225 @@
         // something like this:
         // if (term.field().equals(TEXTFIELD))
-        query_results_xml.append("  <Term value=\"" + term.text() + "\" field=\"" + term.field() + "\" freq=\"" + term_freq + "\" />\n");
+        query_results_xml.append("  <Term value=\"" + xmlSafe(term.text()) + "\" field=\"" + term.field() + "\" freq=\"" + term_freq + "\" />\n");
         }
 
@@ -307 +307 @@
 
     private static String xmlSafe(String text) {
-        return text.replaceAll("\\&", "\\&amp;");
-    }
+    text = text.replaceAll("&","&amp;amp;");
+    text = text.replaceAll("<","&amp;lt;");
+    text = text.replaceAll(">","&amp;gt;");
+    text = text.replaceAll("'","&amp;#039;");
+    text = text.replaceAll("\\\"","&amp;quot;");
+    return text;
+    }
+
 
     private static Query parseQuery(IndexReader reader, QueryParser query_parser, String query_string, String fuzziness)

trunk/indexers/lucene-gs/src/org/greenstone/LuceneWrapper/GS2LuceneQuery.java

@@ -225 +225 @@
         // something like this:
         // if (term.field().equals(TEXTFIELD))
-        query_results_xml.append("  <Term value=\"" + term.text() + "\" field=\"" + term.field() + "\" freq=\"" + term_freq + "\" />\n");
+        query_results_xml.append("  <Term value=\"" + xmlSafe(term.text()) + "\" field=\"" + term.field() + "\" freq=\"" + term_freq + "\" />\n");
         }
 
@@ -307 +307 @@
 
     private static String xmlSafe(String text) {
-        return text.replaceAll("\\&", "\\&amp;");
-    }
+    text = text.replaceAll("&","&amp;amp;");
+    text = text.replaceAll("<","&amp;lt;");
+    text = text.replaceAll(">","&amp;gt;");
+    text = text.replaceAll("'","&amp;#039;");
+    text = text.replaceAll("\\\"","&amp;quot;");
+    return text;
+    }
+
 
     private static Query parseQuery(IndexReader reader, QueryParser query_parser, String query_string, String fuzziness)