Search in PDF Files

src/main/java/org/jabref/logic/pdf/search/indexing/DocumentReader.java

@@ -21,10 +21,13 @@
 import org.apache.lucene.document.StringField;
 import org.apache.lucene.document.TextField;
 import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.interactive.annotation.AnnotationFilter;
+import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation;
 import org.apache.pdfbox.text.PDFTextStripper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.jabref.model.pdf.search.SearchFieldConstants.ANNOTATIONS;
 import static org.jabref.model.pdf.search.SearchFieldConstants.CONTENT;
 import static org.jabref.model.pdf.search.SearchFieldConstants.MODIFIED;
 import static org.jabref.model.pdf.search.SearchFieldConstants.PATH;
@@ -122,6 +125,20 @@ private void addContentIfNotEmpty(PDDocument pdfDocument, Document newDocument)
             if (StringUtil.isNotBlank(pdfContent)) {
                 newDocument.add(new TextField(CONTENT, pdfContent, Field.Store.YES));
             }
+            pdfDocument.getPages().forEach(page -> {
+                try {
+                    for (PDAnnotation annotation : page.getAnnotations( annotation -> {
+                        if (annotation.getContents() == null) {
+                            return false;
+                        }
+                        return annotation.getSubtype().equals("Text") || annotation.getSubtype().equals("Highlight");
+                    })) {
+                        newDocument.add(new TextField(ANNOTATIONS, annotation.getContents(), Field.Store.YES));
+                    }
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            });
         } catch (IOException e) {
             LOGGER.info("Could not read contents of PDF document \"{}\"", pdfDocument.toString(), e);
         }

src/main/java/org/jabref/model/pdf/search/SearchFieldConstants.java

@@ -4,9 +4,10 @@ public class SearchFieldConstants {
 
     public static final String PATH = "path";
     public static final String CONTENT = "content";
+    public static final String ANNOTATIONS = "annotations";
     public static final String MODIFIED = "modified";
 
-    public static final String[] PDF_FIELDS = new String[]{PATH, CONTENT, MODIFIED};
+    public static final String[] PDF_FIELDS = new String[]{PATH, CONTENT, MODIFIED, ANNOTATIONS};
 
-    public static final String VERSION = "0.2a";
+    public static final String VERSION = "0.3a";
 }

src/test/java/org/jabref/logic/pdf/search/retrieval/PdfSearcherTest.java

@@ -82,6 +82,12 @@ public void searchForSecond() throws IOException, ParseException {
         assertEquals(2, result.numSearchResults());
     }
 
+    @Test
+    public void searchForAnnotation() throws IOException, ParseException {
+        PdfSearchResults result = search.search("annotation", 10);
+        assertEquals(2, result.numSearchResults());
+    }
+
     @Test
     public void searchForEmptyString() throws IOException {
         PdfSearchResults result = search.search("", 10);