writeAllHitsToBlackBoard() can now optionally make calls to writeInboxMessage()

This commit is contained in:
Samuel H. Kenyon 2014-04-29 15:24:04 -04:00
parent 1dd46a1ee8
commit f6634fbd3b
2 changed files with 59 additions and 54 deletions

View File

@ -98,9 +98,10 @@ class QueryResults {
* @param query * @param query
* @param listName * @param listName
* @param progress * @param progress
* @param notifyInbox flag indicating whether or not to call writeInboxMessage() for each hit
* @return list of new artifacts * @return list of new artifacts
*/ */
public Collection<BlackboardArtifact> writeAllHitsToBlackBoard(KeywordSearchQuery query, String listName, ProgressHandle progress) { public Collection<BlackboardArtifact> writeAllHitsToBlackBoard(KeywordSearchQuery query, String listName, ProgressHandle progress, boolean notifyInbox) {
final Collection<BlackboardArtifact> newArtifacts = new ArrayList<>(); final Collection<BlackboardArtifact> newArtifacts = new ArrayList<>();
progress.start(getKeywords().size()); progress.start(getKeywords().size());
@ -131,6 +132,9 @@ class QueryResults {
KeywordWriteResult written = query.writeToBlackBoard(hit.toString(), hitFile, snippet, listName); KeywordWriteResult written = query.writeToBlackBoard(hit.toString(), hitFile, snippet, listName);
if (written != null) { if (written != null) {
newArtifacts.add(written.getArtifact()); newArtifacts.add(written.getArtifact());
if (notifyInbox) {
writeInboxMessage(query, written, hitFile);
}
} }
} }
} }
@ -147,8 +151,7 @@ class QueryResults {
/** /**
* Generate an ingest inbox message for this keyword in this file * Generate an ingest inbox message for this keyword in this file
*/ */
public void writeInboxMessage(KeywordSearchQuery query, KeywordList list, KeywordWriteResult written, AbstractFile hitFile) { public void writeInboxMessage(KeywordSearchQuery query, KeywordWriteResult written, AbstractFile hitFile) {
if (list.getIngestMessages()) {
StringBuilder subjectSb = new StringBuilder(); StringBuilder subjectSb = new StringBuilder();
StringBuilder detailsSb = new StringBuilder(); StringBuilder detailsSb = new StringBuilder();
@ -209,6 +212,5 @@ class QueryResults {
IngestServices.getInstance().postMessage(IngestMessage.createDataMessage(KeywordSearchModuleFactory.getModuleName(), subjectSb.toString(), detailsSb.toString(), uniqueKey, written.getArtifact())); IngestServices.getInstance().postMessage(IngestMessage.createDataMessage(KeywordSearchModuleFactory.getModuleName(), subjectSb.toString(), detailsSb.toString(), uniqueKey, written.getArtifact()));
} }
}
} }

View File

@ -524,8 +524,11 @@ public final class SearchRunner {
newArtifacts.add(written.getArtifact()); newArtifacts.add(written.getArtifact());
// inbox // Inbox messages
newResults.writeInboxMessage(keywordSearchQuery, list, written, hitFile); boolean notifyInbox = list.getIngestMessages();
if (notifyInbox) {
newResults.writeInboxMessage(keywordSearchQuery, written, hitFile);
}
} //for each file hit } //for each file hit