diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HighlightedMatchesSource.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HighlightedMatchesSource.java index eaa5b23094..bcc9106cef 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HighlightedMatchesSource.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HighlightedMatchesSource.java @@ -141,7 +141,8 @@ class HighlightedMatchesSource implements MarkupSource, HighlightLookup { return "
" + highlightedContent + "
"; } } catch (SolrServerException ex) { - throw new RuntimeException(ex); + logger.log(Level.INFO, "Could not query markup. ", ex); + return ""; } } diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchQuery.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchQuery.java index 02c2a3baf5..00d7a37fdf 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchQuery.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchQuery.java @@ -77,14 +77,6 @@ public interface KeywordSearchQuery { */ public CollectiongetTerms(); - /** - * write search results to blackboard - * @param newFsHit new fscontent hit associated with the result to write to bb - * @param listname list name with the keyword query, or null - * @return collection of results (with cached bb artifacts/attributes) created and written - */ - public Collection writeToBlackBoard(FsContent newFsHit, String listName); - /** * write results to blackboard per single term and file hit * this method is useful if something else should keep track of partial results to write diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchQueryManager.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchQueryManager.java index 3259a8ce84..76929e30d4 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchQueryManager.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchQueryManager.java @@ -192,10 +192,6 @@ public class KeywordSearchQueryManager implements KeywordSearchQuery { return null; } - @Override - public Collection writeToBlackBoard(FsContent newFsHit, String listName) { - throw new UnsupportedOperationException("writeToBlackBoard() unsupported by manager"); - } @Override public KeywordWriteResult writeToBlackBoard(String termHit, FsContent newFsHit, String listName) { diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchResultFactory.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchResultFactory.java index 1a98a6e30f..c831cdc13f 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchResultFactory.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchResultFactory.java @@ -241,18 +241,17 @@ public class KeywordSearchResultFactory extends ChildFactory { //construct a Solr query using aggregated terms to get highlighting //the query is executed later on demand StringBuilder highlightQuery = new StringBuilder(); - Collection terms = tcq.getTerms(); - if (terms.size() == 1) { + if (tcqRes.keySet().size() == 1) { //simple case, no need to process subqueries and do special escaping - Term term = terms.iterator().next(); - highlightQuery.append(term.getTerm()); + String term = tcqRes.keySet().iterator().next(); + highlightQuery.append(term); } else { - final int lastTerm = terms.size() - 1; + final int lastTerm = tcqRes.keySet().size() - 1; int curTerm = 0; - for (Term term : terms) { + for (String term : tcqRes.keySet()) { //escape subqueries, they shouldn't be escaped again later - final String termS = KeywordSearchUtil.escapeLuceneQuery(term.getTerm(), true, false); + final String termS = KeywordSearchUtil.escapeLuceneQuery(term, true, false); if (!termS.contains("*")) { highlightQuery.append(termS); if (lastTerm != curTerm) { @@ -292,7 +291,7 @@ public class KeywordSearchResultFactory extends ChildFactory { toPopulate.add(new KeyValueQueryContent(f.getName(), resMap, ++resID, f, highlightQueryEscaped, tcq)); } //write to bb - new ResultWriter(fsContents, tcq, theListName).execute(); + new ResultWriter(tcqRes, tcq, theListName).execute(); return true; @@ -378,7 +377,7 @@ public class KeywordSearchResultFactory extends ChildFactory { } //write to bb - new ResultWriter(uniqueMatches, origQuery, "").execute(); + new ResultWriter(matchesRes, origQuery, "").execute(); return true; } @@ -427,16 +426,15 @@ public class KeywordSearchResultFactory extends ChildFactory { */ static class ResultWriter extends SwingWorker { - private static Listwriters = new ArrayList(); - + private static List writers = new ArrayList(); private ProgressHandle progress; private KeywordSearchQuery query; private String listName; - private Set fsContents; + private Map> hits; final Collection na = new ArrayList(); - ResultWriter(Set fsContents, KeywordSearchQuery query, String listName) { - this.fsContents = fsContents; + ResultWriter(Map> hits, KeywordSearchQuery query, String listName) { + this.hits = hits; this.query = query; this.listName = listName; } @@ -447,7 +445,7 @@ public class KeywordSearchResultFactory extends ChildFactory { deregisterWriter(this); progress.finish(); - if (! this.isCancelled() && !na.isEmpty()) { + if (!this.isCancelled() && !na.isEmpty()) { IngestManager.fireServiceDataEvent(new ServiceDataEvent(KeywordSearchIngestService.MODULE_NAME, ARTIFACT_TYPE.TSK_KEYWORD_HIT, na)); } } @@ -456,7 +454,7 @@ public class KeywordSearchResultFactory extends ChildFactory { protected Object doInBackground() throws Exception { registerWriter(this); final String queryStr = query.getQueryString(); - final String queryDisp = queryStr.length()>20?queryStr.substring(0,19) + " ..." : queryStr; + final String queryDisp = queryStr.length() > 20 ? queryStr.substring(0, 19) + " ..." : queryStr; progress = ProgressHandleFactory.createHandle("Saving results: " + queryDisp, new Cancellable() { @Override @@ -465,38 +463,39 @@ public class KeywordSearchResultFactory extends ChildFactory { } }); - progress.start(fsContents.size()); + progress.start(hits.keySet().size()); int processedFiles = 0; - for (final FsContent f : fsContents) { + for (final String hit : hits.keySet()) { + progress.progress(hit, ++processedFiles); if (this.isCancelled()) { break; } - Collection written = query.writeToBlackBoard(f, listName); - for (KeywordWriteResult w : written) { - na.add(w.getArtifact()); + for (FsContent f : hits.get(hit)) { + KeywordWriteResult written = query.writeToBlackBoard(hit, f, listName); + if (written != null) + na.add(written.getArtifact()); } - progress.progress(f.getName(), ++processedFiles); + } return null; } - + private static synchronized void registerWriter(ResultWriter writer) { writers.add(writer); } - + private static synchronized void deregisterWriter(ResultWriter writer) { writers.remove(writer); } - + static synchronized void stopAllWriters() { for (ResultWriter w : writers) { w.cancel(true); writers.remove(w); } } - } } diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LuceneQuery.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LuceneQuery.java index 654be814df..0a1201053d 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LuceneQuery.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LuceneQuery.java @@ -163,8 +163,7 @@ public class LuceneQuery implements KeywordSearchQuery { return query != null && !query.equals(""); } - @Override - public Collection writeToBlackBoard(FsContent newFsHit, String listName) { + private Collection writeToBlackBoard(FsContent newFsHit, String listName) { List ret = new ArrayList(); KeywordWriteResult written = writeToBlackBoard(query, newFsHit, listName); if (written != null) { diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TermComponentQuery.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TermComponentQuery.java index 2f2d9d066b..02a1f74553 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TermComponentQuery.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TermComponentQuery.java @@ -219,26 +219,7 @@ public class TermComponentQuery implements KeywordSearchQuery { } - @Override - public Collection writeToBlackBoard(FsContent newFsHit, String listName) { - Collection writeResults = new ArrayList(); - - //get unique term matches, all cases - Set matches = new HashSet(); - for (Term term : terms) { - //caseInsMatches.put(term.getTerm().toLowerCase(), null); - matches.add(term.getTerm()); - } - - for (String regexMatch : matches) { - KeywordWriteResult written = writeToBlackBoard(regexMatch, newFsHit, listName); - if (written != null) - writeResults.add(written); - } //for each term - - return writeResults; - } - + @Override public Map> performQuery() { Map> results = new HashMap>();