Changeset 7048

Timestamp:

2004-03-15T23:08:23+13:00 (20 years ago)

Author:

mdewsnip

Message:

Now checks for the .xrf file required by the IsisGdl program. Also, bails out if the associated .fdt and .xrf files don't have lowercase extensions (this is a limitation of the IsisGdl program). This is pretty crappy but it should only be an issue on Unix, where the solution should be obvious.

File:

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

trunk/gsdl/perllib/plugins/ISISPlug.pm

@@ -117 +117 @@
     my ($databasename) = ($filename =~ /([^\.]+)\.mst$/i);
 
+    # 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
+    my $fdtfilename = $databasename . ".fdt";
+    if (! -e $fdtfilename) {
+    die "Error: Could not find ISIS FDT file $fdtfilename (lowercase extension important).\n";
+    }
+    my $xrffilename = $databasename . ".xrf";
+    if (! -e $xrffilename) {
+    die "Error: Could not find ISIS XRF file $xrffilename (lowercase extension important).\n";
+    }
+
     # The text to split is exported from the database by the IsisGdl program
     open(FILE, "IsisGdl \"$filename\" |");
@@ -128 +140 @@
 
     # Parse the associated ISIS database Field Definition Table file (.fdt)
-    my $fdtfilename = $databasename . ".fdt";
     my %fdtmapping = &parse_field_definition_table($fdtfilename);