mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-15 13:05:22 +02:00
Code Issues Wiki Activity

[250168] updated

Browse source
This commit is contained in:
David McKnight 2008-11-11 15:04:42 +00:00
parent 5da8773c47
commit 77ce5b12d2
1 changed files with 34 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/UniversalSearchHandler.java
View file

@ -26,6 +26,7 @@ package org.eclipse.rse.internal.dstore.universal.miners.filesystem;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.util.HashSet; import java.util.HashSet;
@ -130,13 +131,10 @@ public class UniversalSearchHandler extends SecuredThread implements ICancellabl
_miner.statusCancelled(_status); _miner.statusCancelled(_status);
} }
else { else {
// NOTE: do not call miner statusDone() method since we want to // previously, the status would be set to done immediately because search results were sent
// update the status immediately. // back to the client as they arrived. Now, the search handler wait until the search has
// Otherwise we don't get an event on the client corresponding // completed before setting the status to done
// to status refresh. As a result client thinks
// search isn't finished.
// _miner.statusDone(_status);
_status.setAttribute(DE.A_NAME, "done"); //$NON-NLS-1$ _status.setAttribute(DE.A_NAME, "done"); //$NON-NLS-1$
_dataStore.refresh(_status); // true indicates refresh immediately _dataStore.refresh(_status); // true indicates refresh immediately
@ -156,18 +154,40 @@ public class UniversalSearchHandler extends SecuredThread implements ICancellabl
} }
protected boolean hasSearched(File file) protected boolean hasSearched(File file)
{ {
return _alreadySearched.contains(file); boolean result = false;
try {
File canonicalFile = file.getCanonicalFile();
// if it's not a symbolic link - if not, we always search it
if (!file.getAbsolutePath().equals(canonicalFile.getAbsolutePath())){
// check whether it's already been searched
result = _alreadySearched.contains(canonicalFile);
}
}
catch (IOException e){
_dataStore.trace(e);
}
return result;
} }
protected void internalSearch(File theFile, int depth) throws SystemMessageException { protected void internalSearch(File theFile, int depth) throws SystemMessageException {
if (!hasSearched(theFile)) { if (theFile.isFile() || !hasSearched(theFile)) {
_alreadySearched.add(theFile);
// is it a directory?
boolean isDirectory = theFile.isDirectory(); boolean isDirectory = theFile.isDirectory();
if (isDirectory){
try {
_alreadySearched.add(theFile.getCanonicalFile());
}
catch (Exception e){
_alreadySearched.add(theFile);
_dataStore.trace(e);
}
}
// is it an archive? // is it an archive?
boolean isArchive = ArchiveHandlerManager.getInstance().isArchive(theFile); boolean isArchive = ArchiveHandlerManager.getInstance().isArchive(theFile);