Changeset 8088

Timestamp:

2004-08-30T12:22:48+12:00 (20 years ago)

Author:

mdewsnip

Message:

Fixed a bug where assigned metadata would be stuffed up on Windows.

File:

• trunk/gli/src/org/greenstone/gatherer/msm/MetadataXMLFileManager.java (modified) (2 diffs)

trunk/gli/src/org/greenstone/gatherer/msm/MetadataXMLFileManager.java

@@ -361 +361 @@
         }
         if(new_metadata != null) {
-        // File level
-        
+        // Convert relative paths into absolute paths
         String filename = file.toString();
-        if (!filename.startsWith(File.separator)) {
+        if ((Utility.isWindows() == true && filename.charAt(1) != ':') ||
+            (Utility.isWindows() == false && !filename.startsWith(File.separator))) {
             String collection_dir = Utility.getCollectionDir();
             File full_file = new File(collection_dir + filename);
@@ -370 +370 @@
         }
 
+        // File level
         if(file.isFile()) {
             // System.err.println("Calling metadata_xml.addMetadata(" + new_metadata + ")...");