Changeset 12715

Timestamp:

2006-09-08T14:56:13+12:00 (18 years ago)

Author:

mdewsnip

Message:

Now supports MST and XRF files with uppercase extensions on Linux, since IsisGdl has been updated.

File:

• trunk/gsdl/perllib/plugins/ISISPlug.pm (modified) (2 diffs)

trunk/gsdl/perllib/plugins/ISISPlug.pm

@@ -124 +124 @@
 
     # Check the associated .fdt and .xrf files exist
-    # These files must have a lowercase extension for the IsisGdl program to work
-    # Bailing out because of this is kind of crappy but it is only an issue on Unix
-    $self->{'fdt_file_path'} = $database_file_path_root . ".fdt";
+    $self->{'fdt_file_path'} = $database_file_path_root . ".FDT";
+    if (!-e $self->{'fdt_file_path'}) {
+    $self->{'fdt_file_path'} = $database_file_path_root . ".fdt";
+    }
     if (!-e $self->{'fdt_file_path'}) {
     print STDERR "<ProcessingError n='$mst_file_path_relative' r='Could not find ISIS FDT file $self->{'fdt_file_path'}'>\n" if ($self->{'gli'});
@@ -132 +133 @@
     return;
     }
-    $self->{'xrf_file_path'} = $database_file_path_root . ".xrf";
+    $self->{'xrf_file_path'} = $database_file_path_root . ".XRF";
+    if (!-e $self->{'xrf_file_path'}) {
+    $self->{'xrf_file_path'} = $database_file_path_root . ".xrf";
+    }
     if (!-e $self->{'xrf_file_path'}) {
     print STDERR "<ProcessingError n='$mst_file_path_relative' r='Could not find ISIS XRF file $self->{'xrf_file_path'}'>\n" if ($self->{'gli'});