Changeset 4398

Timestamp:

2003-05-29T11:04:02+12:00 (21 years ago)

Author:

jmt12

Message:

2030085: Revised FileNodes symbolic link detection so it only checks under non-windows systems. This avoids the problem where windows has absolute path = .../Progra~1/... and canonical path = .../Program Files/...

File:

• trunk/gli/src/org/greenstone/gatherer/file/FileNode.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/file/FileNode.java

@@ -257 +257 @@
             }
         }
-        // Finally remove any files whose canonical path do not match their absolute one (ie symbolic links)
-        for(int k = files.length; k != 0; k--) {
-            try {
-            if(!files[k-1].getAbsolutePath().equals(files[k-1].getCanonicalPath())) {
-                ///ystem.err.println("For file: " + files[k-1].getName());
-                ///ystem.err.println("Absolute Path:  " + files[k-1].getAbsolutePath());
-                ///ystem.err.println("Canonical Path: " + files[k-1].getCanonicalPath());
-                files = ArrayTools.remove(files, (k-1));
+        // Finally remove any files whose canonical path do not match their absolute one (ie symbolic links). We only do this test under linux, because under windows there is no such thing as a symbolic link, and instead we suffer difficulties with the 16bit truncated file paths not being the same as the canonical ones (i.e Program Files => Progra~1).
+        if(!Utility.isWindows()) {
+            for(int k = files.length; k != 0; k--) {
+            try {
+                if(!files[k-1].getAbsolutePath().equals(files[k-1].getCanonicalPath())) {
+                ///ystem.err.println("For file: " + files[k-1].getName());
+                ///ystem.err.println("Absolute Path:  " + files[k-1].getAbsolutePath());
+                ///ystem.err.println("Canonical Path: " + files[k-1].getCanonicalPath());
+                files = ArrayTools.remove(files, (k-1));
+                }
             }
-            }
-            catch (IOException exception) {
-            Gatherer.printStackTrace(exception);
+            catch (IOException exception) {
+                Gatherer.printStackTrace(exception);
+            }
             }
         }