make sure IG db is marked stale if copyanalyzedfiles task does not complete normally

This commit is contained in:
millmanorama 2015-11-03 23:09:02 -05:00
parent 75194f2454
commit 9cad2cb7fe

View File

@ -782,8 +782,8 @@ public final class ImageGalleryController {
+ StringUtils.join(FileTypeUtils.getAllSupportedExtensions(), + StringUtils.join(FileTypeUtils.getAllSupportedExtensions(),
"' or name LIKE '%.") "' or name LIKE '%.")
+ "')"; + "')";
static private final String MIMETYPE_CLAUSE = static private final String MIMETYPE_CLAUSE
"blackboard_attributes.value_text LIKE '" = "blackboard_attributes.value_text LIKE '"
+ StringUtils.join(FileTypeUtils.getAllSupportedMimeTypes(), + StringUtils.join(FileTypeUtils.getAllSupportedMimeTypes(),
"' OR blackboard_attributes.value_text LIKE '") + "' "; "' OR blackboard_attributes.value_text LIKE '") + "' ";
@ -865,13 +865,16 @@ public final class ImageGalleryController {
} catch (TskCoreException ex) { } catch (TskCoreException ex) {
progressHandle.progress("Stopping copy to drawable db task."); progressHandle.progress("Stopping copy to drawable db task.");
Logger.getLogger(CopyAnalyzedFiles.class.getName()).log(Level.WARNING, "Stopping copy to drawable db task. Failed to transfer all database contents: " + ex.getMessage()); Logger.getLogger(CopyAnalyzedFiles.class.getName()).log(Level.WARNING, "Stopping copy to drawable db task. Failed to transfer all database contents: " + ex.getMessage());
progressHandle.finish();
updateMessage("");
updateProgress(-1.0);
controller.setStale(true);
return;
} }
progressHandle.finish(); progressHandle.finish();
updateMessage(""); updateMessage("");
updateProgress(-1.0); updateProgress(-1.0);
controller.setStale(false); controller.setStale(false);
} }
} }