From ae1210c41f1b05d08c86055005e938a73b7d380f Mon Sep 17 00:00:00 2001 From: David McKnight Date: Tue, 26 Sep 2006 16:07:23 +0000 Subject: [PATCH] fix for 158771. Miner needs to handle get remote object command for directories and files (not just filters) --- .../filesystem/UniversalFileSystemMiner.java | 27 +++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/filesystem/UniversalFileSystemMiner.java b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/filesystem/UniversalFileSystemMiner.java index 19dc3a64106..73c0f651e78 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/filesystem/UniversalFileSystemMiner.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/filesystem/UniversalFileSystemMiner.java @@ -1530,7 +1530,8 @@ private DataElement createDataElementFromLSString(DataElement subject, File fileobj = null; boolean isVirtual = false; String fullName = subject.getValue(); - if (queryType.equals(UNIVERSAL_FILTER_DESCRIPTOR)) { + if (queryType.equals(UNIVERSAL_FILTER_DESCRIPTOR)) + { isVirtual = ArchiveHandlerManager.isVirtual(fullName); String filterValue = subject.getValue(); // . translates to home dir @@ -1541,7 +1542,27 @@ private DataElement createDataElementFromLSString(DataElement subject, } if (!isVirtual) fileobj = new File(filterValue); - } else { + } + else if (queryType.equals(UNIVERSAL_FILE_DESCRIPTOR)) + { + String name = subject.getName(); + String path = subject.getValue(); + fileobj = new File(path, name); + } + else if (queryType.equals(UNIVERSAL_FOLDER_DESCRIPTOR)) + { + String name = subject.getName(); + String path = subject.getValue(); + if (name.length() == 0) + { + fileobj = new File(path); + } + else + { + fileobj = new File(path, name); + } + } + else { UniversalServerUtilities.logError(CLASSNAME, "Invalid query type to handleQueryGetRemoteObject", null); return statusDone(status); @@ -1585,6 +1606,8 @@ private DataElement createDataElementFromLSString(DataElement subject, // DKM - do basic property stuff here subject.setAttribute(DE.A_SOURCE, setProperties(fileobj)); + System.out.println("got file:"); + System.out.println(subject); /* // classify the file too