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

Merge pull request #710 from rcordovano/develop

Browse Source 
Convert AbstractFileStringExtract var from instance to local
This commit is contained in:
Richard Cordovano 2014-05-08 11:29:13 -04:00
commit b2275c7327
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringExtract.java
View File

@ -44,12 +44,11 @@ class AbstractFileStringExtract implements AbstractFileExtract {
private static final int BOM_LEN = 0; //disabled prepending of BOM private static final int BOM_LEN = 0; //disabled prepending of BOM
private static final Charset INDEX_CHARSET = Server.DEFAULT_INDEXED_TEXT_CHARSET; private static final Charset INDEX_CHARSET = Server.DEFAULT_INDEXED_TEXT_CHARSET;
private static final SCRIPT DEFAULT_SCRIPT = SCRIPT.LATIN_2; private static final SCRIPT DEFAULT_SCRIPT = SCRIPT.LATIN_2;
private final byte[] stringChunkBuf = new byte[(int) MAX_STRING_CHUNK_SIZE];
private KeywordSearchIngestModule module; private KeywordSearchIngestModule module;
private AbstractFile sourceFile; private AbstractFile sourceFile;
private int numChunks = 0; private int numChunks = 0;
private final List<SCRIPT> extractScripts = new ArrayList<SCRIPT>(); private final List<SCRIPT> extractScripts = new ArrayList<>();
private Map<String, String> extractOptions = new HashMap<String, String>(); private Map<String, String> extractOptions = new HashMap<>();
//disabled prepending of BOM //disabled prepending of BOM
//static { //static {
@ -73,7 +72,7 @@ class AbstractFileStringExtract implements AbstractFileExtract {
@Override @Override
public List<SCRIPT> getScripts() { public List<SCRIPT> getScripts() {
return new ArrayList<SCRIPT>(extractScripts); return new ArrayList<>(extractScripts);
} }
@Override @Override
@ -114,7 +113,7 @@ class AbstractFileStringExtract implements AbstractFileExtract {
return true; return true;
} }
InputStream stringStream = null; InputStream stringStream;
//check which extract stream to use //check which extract stream to use
if (extractScripts.size() == 1 && extractScripts.get(0).equals(SCRIPT.LATIN_1)) { if (extractScripts.size() == 1 && extractScripts.get(0).equals(SCRIPT.LATIN_1)) {
//optimal for english, english only //optimal for english, english only
@ -129,7 +128,8 @@ class AbstractFileStringExtract implements AbstractFileExtract {
success = true; success = true;
//break input stream into chunks //break input stream into chunks
long readSize = 0; final byte[] stringChunkBuf = new byte[(int) MAX_STRING_CHUNK_SIZE];
long readSize;
while ((readSize = stringStream.read(stringChunkBuf, BOM_LEN, (int) MAX_STRING_CHUNK_SIZE - BOM_LEN)) != -1) { while ((readSize = stringStream.read(stringChunkBuf, BOM_LEN, (int) MAX_STRING_CHUNK_SIZE - BOM_LEN)) != -1) {
//FileOutputStream debug = new FileOutputStream("c:\\temp\\" + sourceFile.getName() + Integer.toString(this.numChunks+1)); //FileOutputStream debug = new FileOutputStream("c:\\temp\\" + sourceFile.getName() + Integer.toString(this.numChunks+1));
//debug.write(stringChunkBuf, 0, (int)readSize); //debug.write(stringChunkBuf, 0, (int)readSize);