Changeset 26819 in osm

Timestamp:

2011-10-09T22:30:02+02:00 (13 years ago)

Author:

oliverw

Message:

Fixed #6907 (Error reading audio files from case sensitive filesystem).

File:

• applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java (modified) (2 diffs)

applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java

@@ -365 +365 @@
                 String voxFile = null;
                 if (isExtMode) {
-                        voxFile = csvLine[14].toLowerCase();
+                        voxFile = csvLine[14];
                 } else {
-                        voxFile = csvLine[9].toLowerCase();
+                        voxFile = csvLine[9];
                 }
 
                 if (!ColumbusCSVUtils.isStringNullOrEmpty(voxFile)) {
                         File file = getVoxFilePath(fileDir, voxFile);
-                        if (file.exists()) {
+                        if (file != null && file.exists()) {
+                                // link vox file
                                 int voxNum = getNumberOfVoxfile(voxFile);
                                 lastVoxNumber = Math.max(voxNum, lastVoxNumber);
@@ -447 +448 @@
          */
         public File getVoxFilePath(String fileDir, String voxFile) {
-                File file = new File(fileDir + File.separator + voxFile + ".wav");
-                return file;
+                // The FAT16 file name is interpreted differently from case-sensitive file systems, so we
+                // have to test several variants
+                String[] fileNameVariants = new String[] {voxFile, voxFile.toLowerCase(), voxFile.toUpperCase()};
+                
+                for (int i = 0; i < fileNameVariants.length; i++) {
+                        File file = new File(fileDir + File.separator + fileNameVariants[i] + ".wav");
+                        if (file.exists()) {
+                                return file;
+                        }
+                }
+                return null; // give up...
+                
         }