Changeset 26828 in osm for applications/editors/josm/plugins/ColumbusCSV

Timestamp:

2011-10-10T21:48:48+02:00 (13 years ago)

Author:

oliverw

Message:

Fixed #6907 (Consider also extension for upper/lower case).

File:

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

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

@@ -231 +231 @@
 
                 for (int i = first; i < last; i++) {                    
-                        String voxFile = String.format("vox%05d", i);
-                        String nextVoxFile = String.format("vox%05d", i+1);
+                        String voxFile = String.format("vox%05d.wav", i);
+                        String nextVoxFile = String.format("vox%05d.wav", i+1);
                         if (!voxFiles.containsKey(voxFile)) {
                                 System.out.println("Found lost vox file " + voxFile);
@@ -371 +371 @@
 
                 if (!ColumbusCSVUtils.isStringNullOrEmpty(voxFile)) {
+                        voxFile = voxFile + ".wav";
                         File file = getVoxFilePath(fileDir, voxFile);
                         if (file != null && file.exists()) {
@@ -453 +454 @@
                 
                 for (int i = 0; i < fileNameVariants.length; i++) {
-                        File file = new File(fileDir + File.separator + fileNameVariants[i] + ".wav");
+                        System.out.println("Probing "+ fileNameVariants[i]);
+                        File file = new File(fileDir + File.separator + fileNameVariants[i]);
                         if (file.exists()) {
                                 return file;