[250168] fixes for search

rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/UniversalFileSystemMiner.java

@@ -37,6 +37,7 @@
  * David McKnight  (IBM)  - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
  * David McKnight  (IBM)  - [244277] [dstore] NPE on file save from old client
  * David McKnight  (IBM)  - [246234] Change of file permissions changes the file owner
+ * David McKnight  (IBM)  - [250168] handleCommand should not blindly set the status to "done"
  *******************************************************************************/
 
 package org.eclipse.rse.dstore.universal.miners;
@@ -62,6 +63,7 @@ import org.eclipse.rse.internal.dstore.universal.miners.filesystem.CopySingleThr
 import org.eclipse.rse.internal.dstore.universal.miners.filesystem.CreateFileThread;
 import org.eclipse.rse.internal.dstore.universal.miners.filesystem.CreateFolderThread;
 import org.eclipse.rse.internal.dstore.universal.miners.filesystem.DeleteThread;
+import org.eclipse.rse.internal.dstore.universal.miners.filesystem.FileClassifier;
 import org.eclipse.rse.internal.dstore.universal.miners.filesystem.FileDescriptors;
 import org.eclipse.rse.internal.dstore.universal.miners.filesystem.FileQueryThread;
 import org.eclipse.rse.internal.dstore.universal.miners.filesystem.RenameThread;
@@ -234,7 +236,8 @@ public class UniversalFileSystemMiner extends Miner {
 			UniversalServerUtilities.logError(CLASSNAME,
 					"Invalid query to handlecommand", null, _dataStore); //$NON-NLS-1$
 		}
-		return statusDone(status);
+		//return statusDone(status);
+		return status; // can't assume operation is done since it could be done via a thread
 	}
 
 	private DataElement handleCopyBatch(DataElement targetFolder, DataElement theElement, DataElement status)
@@ -315,7 +318,7 @@ public class UniversalFileSystemMiner extends Miner {
 			//return status;
 		}
 
-		return statusDone(status);
+		return status; // search is in the thread, so it's not done yet
 	}
 
 	public DataElement handleCancel(DataElement subject, DataElement status) {
@@ -1101,11 +1104,10 @@ public class UniversalFileSystemMiner extends Miner {
 
 
 	/**
-	 * Method to obtain the classificatoin string of file or folder.
+	 * Method to obtain the classification string of file or folder.
 	 */
 	protected String getClassificationString(String s) {
 
-		//StringTokenizer tokenizer = new StringTokenizer(s, IServiceConstants.TOKEN_SEPARATOR);
 		String[] str = s.split("\\"+IServiceConstants.TOKEN_SEPARATOR); //$NON-NLS-1$
 		int tokens = str.length;
 		if (tokens < 10)
@@ -1904,8 +1906,47 @@ public class UniversalFileSystemMiner extends Miner {
 
 		String result = getFilePermission(file, PERMISSION_ALL);
         status.setAttribute(DE.A_SOURCE, result);
-    	statusDone(status);
+ 
-
+    	
+    	// for z/os, also need to update the classification if this is a symbolic link
+    	String theOS = System.getProperty("os.name"); //$NON-NLS-1$
+    	boolean isZ = theOS.toLowerCase().startsWith("z");//$NON-NLS-1$	
+    	if (isZ){
+			String path = file.getAbsolutePath();
+			try {
+				String canonical = file.getCanonicalPath();
+				if (!path.equals(canonical)){
+					// reset the properties    					
+					String properties = setProperties(file, false);
+					
+					// fileType
+					String fileType = file.isFile() ? "file" : "directory";  //$NON-NLS-1$//$NON-NLS-2$
+					
+					// classification
+					StringBuffer type = new StringBuffer(FileClassifier.STR_SYMBOLIC_LINK);
+					type.append('(');
+	                type.append(fileType);
+	                type.append(')');
+	                type.append(':');
+	                type.append(canonical);
+	                
+				    StringBuffer classifiedProperties = new StringBuffer(properties);
+				    classifiedProperties.append('|');
+                    classifiedProperties.append(type);
+					    					    					
+	                subject.setAttribute(DE.A_SOURCE, classifiedProperties.toString());
+	                _dataStore.refresh(subject);
+				}
+			}
+			catch (SystemMessageException e)
+			{    				
+			}
+			catch (IOException e)
+			{    				
+			}
+    	}
+    	
+       	statusDone(status);
 		return status;
 	}
 	

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

@@ -18,6 +18,7 @@
  * David McKnight   (IBM)  - [214378] canonical path not required - problem is in the client
  * Noriaki Takatsu (IBM)  - [220126] [dstore][api][breaking] Single process server for multiple clients
  * Martin Oberhuber (Wind River) - [199854][api] Improve error reporting for archive handlers
+ * David McKnight  (IBM)  - [250168] handle malformed binary and always resolve canonical paths
  *******************************************************************************/
 
 package org.eclipse.rse.internal.dstore.universal.miners.filesystem;
@@ -25,7 +26,6 @@ package org.eclipse.rse.internal.dstore.universal.miners.filesystem;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.HashSet;
 
@@ -138,7 +138,7 @@ public class UniversalSearchHandler extends SecuredThread implements ICancellabl
 			// search isn't finished.
 			// _miner.statusDone(_status);
 			_status.setAttribute(DE.A_NAME, "done"); //$NON-NLS-1$
-	        _dataStore.refresh(_status, true);	// true indicates refresh immediately
+	        _dataStore.refresh(_status);	// true indicates refresh immediately
 
 		}
 	}
@@ -155,137 +155,125 @@ public class UniversalSearchHandler extends SecuredThread implements ICancellabl
 		_isCancelled = true;
 	}
 
-	protected boolean hasSearchedDirectory(File file)
+	protected boolean hasSearched(File file)
 	{
-		try
+		return _alreadySearched.contains(file);
-		{
-			return _alreadySearched.contains(file.getCanonicalFile());
-		}
-		catch (IOException e)
-		{
-			_dataStore.trace(e);
-			return _alreadySearched.contains(file);
-		}
 	}
 
 	protected void internalSearch(File theFile, int depth) throws SystemMessageException {
-
+		try {
-		// is it a directory?
+			theFile = theFile.getCanonicalFile();
-		boolean isDirectory = theFile.isDirectory();
-
-		// is it an archive?
-		boolean isArchive = ArchiveHandlerManager.getInstance().isArchive(theFile);
-
-		String absPath = theFile.getAbsolutePath();
-
-
-		String compareStr = theFile.getName();
-
-		// is it a virtual file?
-		boolean isVirtual = ArchiveHandlerManager.isVirtual(absPath);
-
-		// is it a virtual directory?
-		boolean isVirtualDirectory = false;
-
-		// if it is a virtual object, then get a reference to it
-		if (isVirtual) {
-			VirtualChild vc = ArchiveHandlerManager.getInstance().getVirtualObject(absPath);
-			isVirtualDirectory = isVirtual && vc.isDirectory;
 		}
+		catch (Exception e)
+		{			
+		}
+		
+		if (!hasSearched(theFile)) {
 
-		// base case for the recursive method call
+			_alreadySearched.add(theFile);
-		// if the file is not a directory, an archive or a virtual directory,
+			
-		// and we get a match with the file name, then we can search for match within the file
+			// is it a directory?
-		if (!isDirectory &&
+			boolean isDirectory = theFile.isDirectory();
-				(!isArchive || _isFileSearch) &&
+	
-				!isVirtualDirectory &&
+			// is it an archive?
-				doesFilePatternMatch(compareStr) &&
+			boolean isArchive = ArchiveHandlerManager.getInstance().isArchive(theFile);
-				doesClassificationMatch(absPath))
+	
-		{
+			String absPath = theFile.getAbsolutePath();
-			DataElement deObj = null;
+	
-
+			String compareStr = theFile.getName();
-			// if the file is a virtual file, then get matches from the archive handler
+	
-			if (ArchiveHandlerManager.isVirtual(absPath)) {
+			// is it a virtual file?
+			boolean isVirtual = ArchiveHandlerManager.isVirtual(absPath);
+	
+			// is it a virtual directory?
+			boolean isVirtualDirectory = false;
+	
+			// if it is a virtual object, then get a reference to it
+			if (isVirtual) {
 				VirtualChild vc = ArchiveHandlerManager.getInstance().getVirtualObject(absPath);
-
+				isVirtualDirectory = isVirtual && vc.isDirectory;
-				if (!vc.isDirectory) {
+			}
-					deObj = _dataStore.createObject(null, _deVirtualFile, compareStr);
+	
-
+			// base case for the recursive method call
-					// if parent of virtual child is archive, then create it this way
+			// if the file is not a directory, an archive or a virtual directory,
-					if (vc.path.equals("")) { //$NON-NLS-1$
+			// and we get a match with the file name, then we can search for match within the file
-						deObj.setAttribute(DE.A_VALUE, vc.getContainingArchive().getAbsolutePath());
+			if (!isDirectory &&
-					}
+					(!isArchive || _isFileSearch) &&
-					else {
+					!isVirtualDirectory &&
-						deObj.setAttribute(DE.A_VALUE, vc.getContainingArchive().getAbsolutePath() +
+					doesFilePatternMatch(compareStr) &&
-								ArchiveHandlerManager.VIRTUAL_SEPARATOR + vc.path);
+					doesClassificationMatch(absPath))
-					}
+			{
-
+				DataElement deObj = null;
-					deObj.setAttribute(DE.A_SOURCE, _miner.setProperties(vc));
+	
-
+				// if the file is a virtual file, then get matches from the archive handler
-					SystemSearchLineMatch[] results = null;
+				if (ArchiveHandlerManager.isVirtual(absPath)) {
-
+					VirtualChild vc = ArchiveHandlerManager.getInstance().getVirtualObject(absPath);
-					// if it's not a file search, call the handler method to search
+	
-					if (!_isFileSearch) {
+					if (!vc.isDirectory) {
-						results = vc.getHandler().search(vc.fullName, _stringMatcher, null);
+						deObj = _dataStore.createObject(null, _deVirtualFile, compareStr);
-
+	
-						// if at least one match found, then send back the remote file with matches
+						// if parent of virtual child is archive, then create it this way
-						if (results != null && results.length > 0) {
+						if (vc.path.equals("")) { //$NON-NLS-1$
-							convert(deObj, absPath, results);
+							deObj.setAttribute(DE.A_VALUE, vc.getContainingArchive().getAbsolutePath());
+						}
+						else {
+							deObj.setAttribute(DE.A_VALUE, vc.getContainingArchive().getAbsolutePath() +
+									ArchiveHandlerManager.VIRTUAL_SEPARATOR + vc.path);
+						}
+	
+						deObj.setAttribute(DE.A_SOURCE, _miner.setProperties(vc));
+	
+						SystemSearchLineMatch[] results = null;
+	
+						// if it's not a file search, call the handler method to search
+						if (!_isFileSearch) {
+							results = vc.getHandler().search(vc.fullName, _stringMatcher, null);
+	
+							// if at least one match found, then send back the remote file with matches
+							if (results != null && results.length > 0) {
+								convert(deObj, absPath, results);
+								deObj.setParent(_status);
+								_status.addNestedData(deObj, false);
+							}
+						}
+						// otherwise if it is a file search, return the remote file back with no children
+						else {
 							deObj.setParent(_status);
 							_status.addNestedData(deObj, false);
 						}
 					}
-					// otherwise if it is a file search, return the remote file back with no children
+				}
+				// otherwise, search the file
+				else {
+					if (!isArchive) {
+						deObj = _dataStore.createObject(null, _deFile, compareStr);
+					}
 					else {
+						deObj = _dataStore.createObject(null, _deArchiveFile, compareStr);
+					}
+	
+					deObj.setAttribute(DE.A_VALUE, theFile.getParentFile().getAbsolutePath());
+					deObj.setAttribute(DE.A_SOURCE, _miner.setProperties(theFile));
+	
+					// if it is a file search, we send the remote file back
+					// otherwise search within the file and see if there is at least one match
+					if (_isFileSearch || internalSearchWithinFile(deObj, absPath, theFile)) {
 						deObj.setParent(_status);
 						_status.addNestedData(deObj, false);
 					}
 				}
+	
+				// do a refresh
+				//_dataStore.refresh(_status, true);
 			}
-			// otherwise, search the file
+	
-			else {
+			// if the depth is not 0, then we need to recursively search
-				if (!isArchive) {
+			if (depth != 0) {
-					deObj = _dataStore.createObject(null, _deFile, compareStr);
+	
-				}
+				// if it is a directory, or an archive, or a virtual directory, then we need to get the
-				else {
+				// children and search those
-					deObj = _dataStore.createObject(null, _deArchiveFile, compareStr);
+				if (isDirectory || ((isArchive || isVirtualDirectory) && _searchString.isIncludeArchives()))
-				}
+				{			
-
-				deObj.setAttribute(DE.A_VALUE, theFile.getParentFile().getAbsolutePath());
-				deObj.setAttribute(DE.A_SOURCE, _miner.setProperties(theFile));
-
-				// if it is a file search, we send the remote file back
-				// otherwise search within the file and see if there is at least one match
-				if (_isFileSearch || internalSearchWithinFile(deObj, absPath, theFile)) {
-					deObj.setParent(_status);
-					_status.addNestedData(deObj, false);
-				}
-			}
-
-			// do a refresh
-			//_dataStore.refresh(_status, true);
-		}
-
-		// if the depth is not 0, then we need to recursively search
-		if (depth != 0) {
-
-			// if it is a directory, or an archive, or a virtual directory, then we need to get the
-			// children and search those
-			if (isDirectory || ((isArchive || isVirtualDirectory) && _searchString.isIncludeArchives()))
-			{
-
-				if (!hasSearchedDirectory(theFile)) {
-
-					try
-					{
-						_alreadySearched.add(theFile.getCanonicalFile());
-					}
-					catch (IOException e)
-					{
-						_dataStore.trace(e);
-						_alreadySearched.add(theFile);
-					}
-
 					File[] children = null;
 
 					// if the file is an archive or a virtual directory, then get the children from
@@ -348,20 +336,30 @@ public class UniversalSearchHandler extends SecuredThread implements ICancellabl
 
 		try {
 			inputStream = new FileInputStream(theFile);
-			InputStreamReader reader = new InputStreamReader(inputStream);
+			InputStreamReader reader = new InputStreamReader(inputStream);		
 			BufferedReader bufReader = new BufferedReader(reader);
-
+			
-			SystemSearchStringMatchLocator locator = new SystemSearchStringMatchLocator(bufReader, _stringMatcher);
+			// test for unreadable binary
-
+			if (isUnreadableBinary(bufReader)){
-			SystemSearchLineMatch[] matches = locator.locateMatches();
+				// search some other way?
-
+				long size = theFile.length();
-			boolean foundMatches = ((matches != null) && (matches.length > 0));
+				if (simpleSearch(inputStream, size, _stringMatcher)){
-
+					return true;
-			if (foundMatches) {
+				}
-				convert(remoteFile, absPath, matches);
+				return false;
 			}
+			else {
+				SystemSearchStringMatchLocator locator = new SystemSearchStringMatchLocator(bufReader, _stringMatcher);
+						
+				SystemSearchLineMatch[] matches = locator.locateMatches();									
+				boolean foundMatches = ((matches != null) && (matches.length > 0));
 
-			return foundMatches;
+				if (foundMatches) {
+					convert(remoteFile, absPath, matches);
+				}
+
+				return foundMatches;
+			}
 		}
 		catch (Exception e) {
 			UniversalServerUtilities.logError(_miner.getName(), "Error occured when trying to locate matches", e, _dataStore); //$NON-NLS-1$
@@ -369,6 +367,32 @@ public class UniversalSearchHandler extends SecuredThread implements ICancellabl
 			return false;
 		}
 	}
+	
+	private boolean simpleSearch(FileInputStream stream, long size, SystemSearchStringMatcher matcher)
+	{
+		byte[] bytes = new byte[(int)size];
+		try {
+			stream.read(bytes, 0, (int)size);
+		}
+		catch (Exception e){			
+		}
+		
+		String str = new String(bytes);
+		return _stringMatcher.matches(str);
+		
+	}
+	
+	private boolean isUnreadableBinary(BufferedReader reader){
+		try {
+			reader.mark(1);
+			reader.read();
+			reader.reset();
+		}
+		catch (Exception e){
+			return true;
+		}
+		return false;
+	}
 
 	protected boolean doesFilePatternMatch(String compareStr) {
 		return _fileNameMatcher.matches(compareStr);

rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java

@@ -49,7 +49,7 @@
  * David McKnight   (IBM)        - [236039][dstore][efs] DStoreInputStream can report EOF too early - clean up how it waits for the local temp file to be created
  * David McKnight   (IBM)        - [240710] [dstore] DStoreFileService.getFile() fails with NPE for valid root files
  * David McKnight   (IBM)        - [249544] Save conflict dialog appears when saving files in the editor
- * David McKnight   (IBM)        - [249544] some backward compatibility issues with old IBM dstore server
+ * David McKnight   (IBM)        - [250168] some backward compatibility issues with old IBM dstore server
  *******************************************************************************/
 
 package org.eclipse.rse.internal.services.dstore.files;