Changeset 11332

Timestamp:

2006-03-13T11:34:14+13:00 (18 years ago)

Author:

mdewsnip

Message:

Added a mechanism for plugins to do tidying up after exploding. ISISPlug uses this to delete the associated .fdt and .xrf files.

Location:

trunk/gsdl

Files:

• bin/script/explode_metadata_database.pl (modified) (1 diff)
• perllib/plugins/BasPlug.pm (modified) (1 diff)
• perllib/plugins/ISISPlug.pm (modified) (3 diffs)

trunk/gsdl/bin/script/explode_metadata_database.pl

@@ -260 +260 @@
     # Explode means just that: the original file is deleted
     &util::rm($filename);
+    $plugobj->clean_up_after_exploding();
 }
 

trunk/gsdl/perllib/plugins/BasPlug.pm

@@ -1556 +1556 @@
 }
 
+
+# Overridden by exploding plugins (eg. ISISPlug)
+sub clean_up_after_exploding
+{
+    my $self = shift(@_);
+}
+
+
 1;

trunk/gsdl/perllib/plugins/ISISPlug.pm

@@ -123 +123 @@
     # 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.\n";
+    $self->{'fdt_filename'} = $databasename . ".fdt";
+    if (!-e $self->{'fdt_filename'}) {
+    die "Error: Could not find ISIS FDT file " . $self->{'fdt_filename'} . ".\n";
     }
-    my $xrffilename = $databasename . ".xrf";
-    if (! -e $xrffilename) {
-    die "Error: Could not find ISIS XRF file $xrffilename.\n";
+    $self->{'xrf_filename'} = $databasename . ".xrf";
+    if (!-e $self->{'xrf_filename'}) {
+    die "Error: Could not find ISIS XRF file " . $self->{'xrf_filename'} . ".\n";
     }
 
@@ -143 +143 @@
 
     # Parse the associated ISIS database Field Definition Table file (.fdt)
-    my %fdtmapping = &parse_field_definition_table($fdtfilename, $encoding);
-    $self->{'fdt_mapping'} = \%fdtmapping;
+    my %fdt_mapping = &parse_field_definition_table($self->{'fdt_filename'}, $encoding);
+    $self->{'fdt_mapping'} = \%fdt_mapping;
 
     # Remove the line at the start so it is split and processed properly
@@ -341 +341 @@
 
 
+sub clean_up_after_exploding
+{
+    my $self = shift(@_);
+
+    # Delete the FDT and XRF files too
+    &util::rm($self->{'fdt_filename'});
+    &util::rm($self->{'xrf_filename'});
+}
+
+
 1;