Changeset 11334 for trunk/gsdl/perllib/plugins/ISISPlug.pm

Timestamp:

2006-03-13T13:11:54+13:00 (18 years ago)

Author:

mdewsnip

Message:

Errors reading the .fdt or .xrf files are now reported back to the GLI nicely.

File:

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

trunk/gsdl/perllib/plugins/ISISPlug.pm

@@ -117 +117 @@
     my $self = shift (@_);
     my ($filename, $encoding, $language, $textref) = @_;
-
-    my ($databasename) = ($filename =~ /(.*)\.mst$/i);
+    my $outhandle = $self->{'outhandle'};
+
+    my ($database_file_path_root) = ($filename =~ /(.*)\.mst$/i);
+    my $mst_file_path_relative = $filename;
+    $mst_file_path_relative =~ s/^.+import.(.*?)$/$1/;
 
     # 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_filename'} = $databasename . ".fdt";
-    if (!-e $self->{'fdt_filename'}) {
-    die "Error: Could not find ISIS FDT file " . $self->{'fdt_filename'} . ".\n";
+    $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'});
+    print $outhandle "Error: Could not find ISIS FDT file " . $self->{'fdt_file_path'} . ".\n";
+    return;
     }
-    $self->{'xrf_filename'} = $databasename . ".xrf";
-    if (!-e $self->{'xrf_filename'}) {
-    die "Error: Could not find ISIS XRF file " . $self->{'xrf_filename'} . ".\n";
+    $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'});
+    print $outhandle "Error: Could not find ISIS XRF file " . $self->{'xrf_file_path'} . ".\n";
+    return;
     }
 
@@ -143 +150 @@
 
     # Parse the associated ISIS database Field Definition Table file (.fdt)
-    my %fdt_mapping = &parse_field_definition_table($self->{'fdt_filename'}, $encoding);
+    my %fdt_mapping = &parse_field_definition_table($self->{'fdt_file_path'}, $encoding);
     $self->{'fdt_mapping'} = \%fdt_mapping;
 
@@ -346 +353 @@
 
     # Delete the FDT and XRF files too
-    &util::rm($self->{'fdt_filename'});
-    &util::rm($self->{'xrf_filename'});
+    &util::rm($self->{'fdt_file_path'});
+    &util::rm($self->{'xrf_file_path'});
 }