Changeset 34265 for main/trunk/gli/src/org/greenstone/gatherer/metadata/MetadataToCSV.java

Timestamp:

2020-07-12T13:25:34+12:00 (4 years ago)

Author:

ak19

Message:

MetadataCSVPlugin doesn't like windows style slashes in the Filename column. This meant MetadataToCSV run from windows didn't generate a metadata.csv acceptable to MetaCSVPlug. Committing from Linux, will then need retest from Win client.

File:

• main/trunk/gli/src/org/greenstone/gatherer/metadata/MetadataToCSV.java (modified) (4 diffs)

main/trunk/gli/src/org/greenstone/gatherer/metadata/MetadataToCSV.java

@@ -46 +46 @@
 import org.apache.commons.csv.*;
 
-import org.greenstone.gatherer.util.SafeProcess;
 import org.greenstone.gatherer.DebugStream;
 import org.greenstone.gatherer.Dictionary;
@@ -52 +51 @@
 import org.greenstone.gatherer.metadata.MetadataValue;
 import org.greenstone.gatherer.metadata.MetadataXMLFileManager;
-
+import org.greenstone.gatherer.util.SafeProcess;
+import org.greenstone.gatherer.util.Utility;
 
 
@@ -116 +116 @@
         return fullPath;
     } else {
-        return fullPath.substring(indexMatch+import_path_length);
+        fullPath =  fullPath.substring(indexMatch+import_path_length);
+        // MetadataCSVPlugin wants URL style slashes (forward slashes) not Windows backslashes
+        // as file separator. But on Linux, backslashes have a different meaning in filepaths,
+        // so must only replace \ with / if we're on Windows.
+        if(Utility.isWindows()) {
+        fullPath = fullPath.replace("\\", "/");
+        }
+        return fullPath;
     }
     }
@@ -426 +433 @@
             String filename = field;
             // TODO: filenames are stored relative to import folder, convert to full path for internal use?
+            // Relative filepaths are stored with URL style slashes not OS specific slashes
+            // For Windows, reconvert to \
+            //File fullPathFile = new File(coll_importdir_path, filename); // would this work to
+                         // create OS specific paths, even if filename has slashes the wrong way round for Windows?
+            if(Utility.isWindows()) {
+                filename = filename.replace("/", "\\");
+            }
             File fullPathFile = new File(coll_importdir_path + filename);
             ///System.err.println("Found Filename meta: " + filename);