mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-17 18:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Code and comment cleanup

Browse Source
This commit is contained in:
Eugene Livis 2016-07-15 13:05:57 -04:00
parent e44e9b76c8
commit 9dfe64a71a
2 changed files with 2 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HighlightedText.java
View File

@ -298,47 +298,16 @@ class HighlightedText implements IndexedText, TextMarkupLookup {
String highLightField = null; String highLightField = null;
//String highlightQuery = keywordHitQuery;
if (isRegex) { if (isRegex) {
highLightField = LuceneQuery.HIGHLIGHT_FIELD_REGEX; highLightField = LuceneQuery.HIGHLIGHT_FIELD_REGEX;
//escape special lucene chars if not already escaped (if not a compound query)
//TODO a better way to mark it a compound highlight query
// ELDEBUG:
//final String findSubstr = LuceneQuery.HIGHLIGHT_FIELD_REGEX + ":";
//if (!highlightQuery.contains(findSubstr)) {
// highlightQuery = KeywordSearchUtil.escapeLuceneQuery(highlightQuery);
//}
} else { } else {
highLightField = LuceneQuery.HIGHLIGHT_FIELD_LITERAL; highLightField = LuceneQuery.HIGHLIGHT_FIELD_LITERAL;
//escape special lucene chars always for literal queries query
//highlightQuery = KeywordSearchUtil.escapeLuceneQuery(highlightQuery);
} }
SolrQuery q = new SolrQuery(); SolrQuery q = new SolrQuery();
q.setShowDebugInfo(DEBUG); //debug q.setShowDebugInfo(DEBUG); //debug
/*String queryStr = null; // input query has already been escaped
if (isRegex) {
StringBuilder sb = new StringBuilder();
sb.append(highLightField).append(":");
if (group) {
sb.append("\"");
}
sb.append(highlightQuery);
if (group) {
sb.append("\"");
}
queryStr = sb.toString();
} else {
//use default field, simplifies query
//always force grouping/quotes
queryStr = KeywordSearchUtil.quoteQuery(highlightQuery);
}*/
//q.setQuery(queryStr);
q.setQuery(keywordHitQuery); q.setQuery(keywordHitQuery);
String contentIdStr = Long.toString(this.objectId); String contentIdStr = Long.toString(this.objectId);

24
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchResultFactory.java
View File

@ -247,7 +247,6 @@ class KeywordSearchResultFactory extends ChildFactory<KeyValueQueryContent> {
* @return * @return
*/ */
private String getHighlightQuery(KeywordSearchQuery query, boolean literal_query, QueryResults queryResults, Content content) { private String getHighlightQuery(KeywordSearchQuery query, boolean literal_query, QueryResults queryResults, Content content) {
//String highlightQueryEscaped;
StringBuilder highlightQuery = new StringBuilder(); StringBuilder highlightQuery = new StringBuilder();
if (literal_query) { if (literal_query) {
//literal, treat as non-regex, non-term component query //literal, treat as non-regex, non-term component query
@ -255,12 +254,9 @@ class KeywordSearchResultFactory extends ChildFactory<KeyValueQueryContent> {
} else { } else {
//construct a Solr query using aggregated terms to get highlighting //construct a Solr query using aggregated terms to get highlighting
//the query is executed later on demand //the query is executed later on demand
if (queryResults.getKeywords().size() == 1) { if (queryResults.getKeywords().size() == 1) {
//simple case, no need to process subqueries and do special escaping //simple case, no need to process subqueries and do special escaping
Keyword term = queryResults.getKeywords().iterator().next(); Keyword term = queryResults.getKeywords().iterator().next();
//highlightQuery.append(term.toString());
//highlightQuery.append(LuceneQuery.HIGHLIGHT_FIELD_REGEX).append(":").append(KeywordSearchUtil.escapeLuceneQuery(term.toString()));
highlightQuery.append(LuceneQuery.HIGHLIGHT_FIELD_REGEX).append(":").append(KeywordSearchUtil.escapeLuceneQuery(term.getQuery())); highlightQuery.append(LuceneQuery.HIGHLIGHT_FIELD_REGEX).append(":").append(KeywordSearchUtil.escapeLuceneQuery(term.getQuery()));
} else { } else {
//find terms for this content hit //find terms for this content hit
@ -277,33 +273,15 @@ class KeywordSearchResultFactory extends ChildFactory<KeyValueQueryContent> {
final int lastTerm = hitTerms.size() - 1; final int lastTerm = hitTerms.size() - 1;
int curTerm = 0; int curTerm = 0;
for (Keyword term : hitTerms) { for (Keyword term : hitTerms) {
//escape subqueries, they shouldn't be escaped again later //escape subqueries, MAKE SURE they are not escaped again later
//StringBuilder currentKeywordQuery = new StringBuilder();
//currentKeywordQuery.append(LuceneQuery.HIGHLIGHT_FIELD_REGEX).append(":").append(KeywordSearchUtil.escapeLuceneQuery(term));
//highlightQuery.append(KeywordSearchUtil.quoteQuery(currentKeywordQuery.toString()));
highlightQuery.append(LuceneQuery.HIGHLIGHT_FIELD_REGEX).append(":").append("\"").append(KeywordSearchUtil.escapeLuceneQuery(term.getQuery())).append("\""); highlightQuery.append(LuceneQuery.HIGHLIGHT_FIELD_REGEX).append(":").append("\"").append(KeywordSearchUtil.escapeLuceneQuery(term.getQuery())).append("\"");
/*final String termS = KeywordSearchUtil.escapeLuceneQuery(term);
highlightQuery.append("\"");
highlightQuery.append(termS);
highlightQuery.append("\"");*/
//highlightQuery.append(term); // ELDEBUG
if (lastTerm != curTerm) { if (lastTerm != curTerm) {
highlightQuery.append(" "); //acts as OR || highlightQuery.append(" "); //acts as OR ||
//force HIGHLIGHT_FIELD_REGEX index and stored content
//in each term after first. First term taken care by HighlightedMatchesSource
//highlightQuery.append(LuceneQuery.HIGHLIGHT_FIELD_REGEX).append(":");
} }
++curTerm; ++curTerm;
} }
} }
//String highlightQueryEscaped = KeywordSearchUtil.escapeLuceneQuery(highlightQuery.toString());
//highlightQueryEscaped = highlightQuery.toString();
} }
return highlightQuery.toString(); return highlightQuery.toString();