Changeset 11332
- Timestamp:
- 2006-03-13T11:34:14+13:00 (18 years ago)
- Location:
- trunk/gsdl
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gsdl/bin/script/explode_metadata_database.pl
r11302 r11332 260 260 # Explode means just that: the original file is deleted 261 261 &util::rm($filename); 262 $plugobj->clean_up_after_exploding(); 262 263 } 263 264 -
trunk/gsdl/perllib/plugins/BasPlug.pm
r11122 r11332 1556 1556 } 1557 1557 1558 1559 # Overridden by exploding plugins (eg. ISISPlug) 1560 sub clean_up_after_exploding 1561 { 1562 my $self = shift(@_); 1563 } 1564 1565 1558 1566 1; -
trunk/gsdl/perllib/plugins/ISISPlug.pm
r11329 r11332 123 123 # These files must have a lowercase extension for the IsisGdl program to work 124 124 # Bailing out because of this is kind of crappy but it is only an issue on Unix 125 my $fdtfilename= $databasename . ".fdt";126 if (! -e $fdtfilename) {127 die "Error: Could not find ISIS FDT file $fdtfilename.\n";125 $self->{'fdt_filename'} = $databasename . ".fdt"; 126 if (!-e $self->{'fdt_filename'}) { 127 die "Error: Could not find ISIS FDT file " . $self->{'fdt_filename'} . ".\n"; 128 128 } 129 my $xrffilename= $databasename . ".xrf";130 if (! -e $xrffilename) {131 die "Error: Could not find ISIS XRF file $xrffilename.\n";129 $self->{'xrf_filename'} = $databasename . ".xrf"; 130 if (!-e $self->{'xrf_filename'}) { 131 die "Error: Could not find ISIS XRF file " . $self->{'xrf_filename'} . ".\n"; 132 132 } 133 133 … … 143 143 144 144 # Parse the associated ISIS database Field Definition Table file (.fdt) 145 my %fdt mapping = &parse_field_definition_table($fdtfilename, $encoding);146 $self->{'fdt_mapping'} = \%fdt mapping;145 my %fdt_mapping = &parse_field_definition_table($self->{'fdt_filename'}, $encoding); 146 $self->{'fdt_mapping'} = \%fdt_mapping; 147 147 148 148 # Remove the line at the start so it is split and processed properly … … 341 341 342 342 343 sub clean_up_after_exploding 344 { 345 my $self = shift(@_); 346 347 # Delete the FDT and XRF files too 348 &util::rm($self->{'fdt_filename'}); 349 &util::rm($self->{'xrf_filename'}); 350 } 351 352 343 353 1;
Note:
See TracChangeset
for help on using the changeset viewer.