Added additional ODF formats to indexing.

diff --git a/src/cx/fbn/nevernote/threads/IndexRunner.java b/src/cx/fbn/nevernote/threads/IndexRunner.java
index e0a122c..c82e7ae 100644 (file)
--- a/src/cx/fbn/nevernote/threads/IndexRunner.java
+++ b/src/cx/fbn/nevernote/threads/IndexRunner.java
@@ -34,7 +34,7 @@ import org.apache.tika.metadata.Metadata;
 import org.apache.tika.parser.ParseContext;\r
 import org.apache.tika.parser.microsoft.OfficeParser;\r
 import org.apache.tika.parser.microsoft.ooxml.OOXMLParser;\r
-import org.apache.tika.parser.odf.OpenDocumentContentParser;\r
+import org.apache.tika.parser.odf.OpenDocumentParser;\r
 import org.apache.tika.parser.pdf.PDFParser;\r
 import org.apache.tika.parser.rtf.RTFParser;\r
 import org.apache.tika.sax.BodyContentHandler;\r
@@ -256,7 +256,12 @@ public class IndexRunner extends QObject implements Runnable {
                                        indexResourceRTF(r);\r
                                        return;\r
                }\r
-               if (r.getMime().equalsIgnoreCase("application/odf")) {\r
+               if (r.getMime().equalsIgnoreCase("application/odf") ||\r
+                       r.getMime().equalsIgnoreCase("application/odt") ||\r
+                       r.getMime().equalsIgnoreCase("application/odp") ||\r
+                       r.getMime().equalsIgnoreCase("application/odg") ||\r
+                       r.getMime().equalsIgnoreCase("application/odb") ||\r
+                       r.getMime().equalsIgnoreCase("application/ods")) {\r
                        indexResourceODF(r);\r
                        return;\r
                }\r
@@ -313,7 +318,7 @@ public class IndexRunner extends QObject implements Runnable {
                        input = new FileInputStream(new File(f.fileName()));\r
                        ContentHandler textHandler = new BodyContentHandler();\r
                        Metadata metadata = new Metadata();\r
-                       OpenDocumentContentParser parser = new OpenDocumentContentParser();     \r
+                       OpenDocumentParser parser = new OpenDocumentParser();   \r
                        ParseContext context = new ParseContext();\r
                        parser.parse(input, textHandler, metadata, context);\r
                        String[] result = textHandler.toString().split(regex);\r