1251 Commits

Author SHA1 Message Date
Eamonn Saunders
241b06c1a6 - Removed references to the artifact id mask (0x8000000000000000)
- Modified SolrSearchService.indexArtifacts() to ignore artifacts with an artifact_id > 0.
2015-01-15 16:04:54 -05:00
Eamonn Saunders
f1d9e34d52 When creating a KeyValueQueryContent object in KeywordSearchResultsFactory.createFlatKeys() the name is now set to either a file name or a string indicating which type of artifact produced the keyword hit. 2015-01-14 16:24:16 -05:00
Eamonn Saunders
2aeab97440 Text produced for artifact indexing now includes attribute names and formatted datetimes. 2015-01-13 15:05:17 -05:00
Eamonn Saunders
0e80551dda Merge richard/artifact_keyword_search into art_kws_integration 2015-01-09 17:39:45 -05:00
Eamonn Saunders
5b2eb2f8aa - Modified getSolrContent() to call the new Server.getSolrContent() method that takes an object id and a chunk id. 2015-01-09 17:39:09 -05:00
Eamonn Saunders
2240100b72 - Added package scoped methods that get Solr Content given an object id and an optional chunk id.
- Modified getSolrContent() to more robustly handle the situation where the indexed text field may or may not contain a file name.
2015-01-09 17:38:04 -05:00
Eamonn Saunders
d7eadb2d0c Added a package scoped getObjectId() method. 2015-01-09 17:34:36 -05:00
Eamonn Saunders
8b55bcde1d Implented an alternate mechanism for determining document/object id. If the node has a HighlightedTextMarkup object, we will use its object id, otherwise we use the Content id. 2015-01-09 17:32:57 -05:00
Richard Cordovano
76884f79c1 Remove KeywordSearchServiceFactory interface and Solr implementation 2015-01-09 15:19:49 -05:00
Richard Cordovano
60ab0a1188 Add Solr Object id to KeyValueQueryContent 2015-01-09 13:51:14 -05:00
Eamonn Saunders
ba73f4ed9a Escape id string being passed into Lucene. 2015-01-09 13:27:31 -05:00
Eamonn Saunders
530b82c30b Merge richard/artifact_keyword_search into art_kws_integration
Resolved conflict in
	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HighlightedTextMarkup.java
2015-01-09 12:36:41 -05:00
Eamonn Saunders
8c5593bd98 Merge richard/artifact_keyword_search into art_kws_integration
Resolved conflict in
	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HighlightedTextMarkup.java
2015-01-09 12:36:20 -05:00
Eamonn Saunders
8ffea0d8d3 Changed getObjectId() to getDocumentId() and correctly mask artifact id. 2015-01-09 12:13:26 -05:00
Eamonn Saunders
b4b7e5ca0f Escape the content id string being used in the query filter. 2015-01-09 12:11:22 -05:00
Eamonn Saunders
cc97d0dc4b Escape the object id being used in the query filter. 2015-01-09 12:10:11 -05:00
Eamonn Saunders
a3bdef06a7 Use existing Lucene query escaping method. 2015-01-09 12:08:02 -05:00
Eamonn Saunders
d43caca0d5 - Modified SolrSearchService to create 2 index entries for an artifact (a base entry with the masked artifact id and a chunk entry with the content). 2015-01-09 12:02:27 -05:00
Richard Cordovano
7ff428b7c0 Complete first attempt at search/artifact generation for artifact keyword search prototype 2015-01-09 11:48:08 -05:00
Richard Cordovano
b992035188 Interim checkin: first draft of artifact keyword search hit artifact generation 2015-01-07 17:04:41 -05:00
Eamonn Saunders
a9aacc1287 Merge artifact_content_viewer into art_kws_integration 2015-01-07 13:03:45 -05:00
Eamonn Saunders
459d6c8f81 - Added comments and made minor modifications to ExtractedContentViewer.getObjectId() 2015-01-07 12:58:10 -05:00
Eamonn Saunders
7c2a548dd8 Modifications to support displaying indexed artifact text in content viewer:
- Modified HighlightedTestMarkup constructor to take an object id instead of a Content object. The object id can either be for a file or an artifact. The highlighter uses the object id to get the indexed text from Solr.
- Modified RawTextMarkup constructor to take both a Content object and an object id. RawTextMarkup needs the Content object to display messages about whether the file was skipped (because it is a known file) or whether the file content has yet to be indexed.
- Added a method to ExtractedContentViewer to get the correct object id. If the node contains a keyword hit blackboard artifact that contains a TSK_ASSOCIATED_ARTIFACT attribute, the object id is the artifact id of the associated artifact. Otherwise the object id is obtained from the Content object.
2015-01-07 12:52:55 -05:00
Richard Cordovano
dfe4c27d30 Interim checkin of changes to the keyword search and hit artifact generation 2015-01-07 11:27:14 -05:00
Eamonn Saunders
6576d8c8c6 Initial version of blackboard artifact indexing:
- Added KeywordSearchService and KeywordSearchServiceFactory interfaces to Autopsy core.
- Modified Services.java to load a keyword search service provider and added the getKeywordSearchService() method.
- Added SolrSearchService and SolrSearchServiceFactory to keyword search module.
- Changed Ingester.ingest(ContentStream ...) from private to package scope.
- SolrSearchService.indexArtifact concatenates all attribute values into a single string, sets the document id to art-<artifact-id> and calls Ingester.ingest()
- Modified ExifParserFileIngestModule to pass EXIF artifacts to the artifact indexer.
2015-01-02 13:33:26 -05:00
Richard Cordovano
cb01eb40cd Make recent activity module cancellable 2014-11-06 21:14:26 -05:00
Brian Carrier
69c35704cf updated to version 3.1.1 and associated Library versions 2014-10-31 12:17:50 -04:00
Brian Carrier
aa9d41e1d3 Fixed bug that made regexp checkbox always disabled. Fixed bug that caused remove keyword to always be enabled. 2014-09-26 17:08:22 -04:00
Richard Cordovano
0b60ada1bd Remove commented out code in XmlKeywordSearchList.java 2014-09-26 12:19:34 -04:00
Richard Cordovano
9817a2f9a6 Rework initial API of new keyword lists manager class, part 2 2014-09-26 11:52:30 -04:00
Richard Cordovano
c50076b420 Rework initial API of new keyword lists manager class 2014-09-26 11:47:10 -04:00
Richard Cordovano
1249ab8376 Create keyword lists manager to establish an appropriate public interface 2014-09-26 10:20:45 -04:00
Richard Cordovano
8c006ed4b4 Make XmlKeywordSearchList pubic to allow NBM classes to be property change listeners 2014-09-25 17:14:01 -04:00
Richard Cordovano
80ed8b7f82 Merge pull request #896 from esaunders/jpeg_indexing
Index metadata extracted by Tika even if the file format contains no use...
2014-09-25 13:33:02 -04:00
Eamonn Saunders
6f6b7ee51f Index metadata extracted by Tika even if the file format contains no useful content (e.g. jpeg files). 2014-09-25 13:02:38 -04:00
Richard Cordovano
de76c4946e Improve deserialization of older versions of hash lookup and keyword search settings 2014-09-24 15:57:15 -04:00
Richard Cordovano
b35cb32290 Add javadocs Comments to KeywordSearchJobSettings.java 2014-09-24 15:52:46 -04:00
Richard Cordovano
c42e7bcf97 Remove unneeded code in KeywordSearchJobSettings 2014-09-24 15:40:53 -04:00
Richard Cordovano
5aff0e07f8 Make new keyword lists enabled by default in all contexts 2014-09-24 15:37:43 -04:00
Brian Carrier
b067d02736 Merge branch 'develop' of github.com:sleuthkit/autopsy into develop 2014-09-23 17:17:48 -04:00
Brian Carrier
e5ecfc5ab3 exposed method to detect file type, keyword search uses existing blackboard type or utility method. Fixes bug whereby open office documents did not have text extracted. 2014-09-23 17:05:44 -04:00
Karl Mortensen
ed53e0d5e1 Add dependency to KeywordSearch 2014-09-23 12:25:08 -04:00
Brian Carrier
7fc9eba784 updated to use getDataSource versus getImage, removed unneeded Image methods from case, renamed getRootObjects to getDataSources. Fixed keyword search bug that did not work on local files 2014-08-14 18:48:33 -07:00
Brian Carrier
c21ee90758 fixed bug so that ingest messages are enabled by default on new lists 2014-08-13 12:55:56 -07:00
Richard Cordovano
30f305d40d Fix IngestManager cancellation of all jobs, KeywordSearch.Ingest bug 2014-07-17 15:28:48 -04:00
Brian Carrier
e5026a108b Changed uses of Java loggger to Autopsy logger 2014-07-10 17:13:40 -04:00
Brian Carrier
85548bd89b Updated version numbers for 3.1.0 2014-07-09 12:10:09 -04:00
Nick Davis
2a2b8ba847 Re-added newlines to strings in properties files. 2014-07-02 21:10:39 -04:00
Nick Davis
b1675044bd Fixed chars displayed as squares font issue. 2014-06-16 17:29:49 -04:00
Nick Davis
300b9b8307 Cleaned up font fix changes. 2014-06-16 14:56:53 -04:00