From 8749bfa5ea23cd125dcce3a520ddc9575aa6dad3 Mon Sep 17 00:00:00 2001 From: Eugene Livis Date: Fri, 13 Jan 2017 13:39:26 -0500 Subject: [PATCH] Added a dialog to ask user whether they want to upgrade index --- .../autopsy/keywordsearch/Bundle.properties | 3 +++ .../autopsy/keywordsearch/IndexHandling.java | 1 + .../keywordsearch/SolrSearchService.java | 18 ++++++++++-------- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties index 576ce90aac..81e57cbf25 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties @@ -313,3 +313,6 @@ GlobalEditListPanel.keywordDupesSkipped.text={0} keyword was already in the list GlobalEditListPanel.keywordDupesSkippedPlural.text={0} keywords were already in the list. GlobalEditListPanel.keywordErrors.text={0} keyword could not be parsed. Please review and try again. GlobalEditListPanel.keywordErrorsPlural.text={0} keywords could not be parsed. Please review and try again. +SolrSearchService.IndexUpgradeDialog.title=Index Upgrade Required In Order To Open Case +SolrSearchService.IndexUpgradeDialog.msg=Index upgrade can be a very lengthy operation.
Upon upgrade you will be able to see existing key word search results and perform literal key word searches on the existing index.
However, you will not be able to add new text to the index or performing regex searches.
You must re-run Keyword Search Ingest Module if you want to index new text or performing regex searches.
Do you wish to proceed with the index upgrade?. +SolrSearchService.IndexUpgradeDialog.upgradeDeclinedMsg=Index upgrade was declined by user \ No newline at end of file diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/IndexHandling.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/IndexHandling.java index 757b2189b4..76e446c51a 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/IndexHandling.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/IndexHandling.java @@ -96,6 +96,7 @@ class IndexHandling { } } + // ELTODO This is NTH: static void createReferenceConfigSetCopy(String indexPath) throws AutopsyService.AutopsyServiceException { File pathToConfigSet = new File(""); Logger logger = Logger.getLogger(IndexHandling.class.getName()); // ELTODO REMOVE diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SolrSearchService.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SolrSearchService.java index d6bad76073..f35957e6a4 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SolrSearchService.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SolrSearchService.java @@ -166,9 +166,11 @@ public class SolrSearchService implements KeywordSearchService, AutopsyService if (RuntimeProperties.coreComponentsAreActive()) { //pop up a message box to indicate the restrictions on adding additional //text and performing regex searches and give the user the option to decline the upgrade - boolean upgradeDeclined = false; - if (upgradeDeclined) { - throw new AutopsyServiceException("ELTODO"); + if (!KeywordSearchUtil.displayConfirmDialog(NbBundle.getMessage(this.getClass(), "SolrSearchService.IndexUpgradeDialog.title"), + NbBundle.getMessage(this.getClass(), "SolrSearchService.IndexUpgradeDialog.msg"), + KeywordSearchUtil.DIALOG_MESSAGE_TYPE.WARN)) { + // upgrade declined - throw exception + throw new AutopsyServiceException(NbBundle.getMessage(this.getClass(), "SolrSearchService.IndexUpgradeDialog.upgradeDeclinedMsg")); } } @@ -195,8 +197,7 @@ public class SolrSearchService implements KeywordSearchService, AutopsyService success = true; // ELTODO remove if (!success) { // delete the new directories - - // close the upgraded index? + new File(newIndexDir).delete(); throw new AutopsyServiceException("ELTODO"); } @@ -207,12 +208,13 @@ public class SolrSearchService implements KeywordSearchService, AutopsyService success = true; // ELTODO remove if (!success) { // delete the new directories - - // close the upgraded index? + new File(newIndexDir).delete(); + // ELTODO close the upgraded index? throw new AutopsyServiceException("ELTODO"); } - // currentVersionIndexDir = upgraded index dir + // set the upgraded reference index as the index to be used for this case + currentVersionIndexDir = newIndexDir; } // open currentVersionIndexDir index