Changeset 8143

Timestamp:

2004-09-23T16:08:51+12:00 (20 years ago)

Author:

mdewsnip

Message:

Fixed code for converting between Windows and Unix file paths.

File:

• trunk/gli/src/org/greenstone/gatherer/metadata/DocXMLFile.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/metadata/DocXMLFile.java

@@ -168 +168 @@
             if (is_unix_path && Utility.isWindows()) {
                 // Convert path from Unix to Windows
-                gsdlsourcefilename_value = gsdlsourcefilename_value.replaceAll("/", File.separator);
-            }
-            if (!is_unix_path && !Utility.isWindows()) {
+                gsdlsourcefilename_value = gsdlsourcefilename_value.replaceAll("\\/", "\\\\");
+            }
+            else if (!is_unix_path && !Utility.isWindows()) {
                 // Convert path from Windows to Unix
-                gsdlsourcefilename_value = gsdlsourcefilename_value.replaceAll("\\\\", File.separator);
+                gsdlsourcefilename_value = gsdlsourcefilename_value.replaceAll("\\\\", "/");
             }
 
             // Remember this for quick access later
-            if (gsdlsourcefilename_value != null) {
-                files_in_doc_xml_file.add(gsdlsourcefilename_value);
-            }
+            files_in_doc_xml_file.add(gsdlsourcefilename_value);
             }
             else {