Changeset 11262 for trunk

Timestamp:

2006-02-16T10:18:26+13:00 (18 years ago)

Author:

mdewsnip

Message:

The FDT file wasn't being read using the encoding specified, so things would go bad if there were non-ASCII characters in the field names.

File:

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

trunk/gsdl/perllib/plugins/ISISPlug.pm

@@ -141 +141 @@
 
     # Parse the associated ISIS database Field Definition Table file (.fdt)
-    my %fdtmapping = &parse_field_definition_table($fdtfilename);
+    my %fdtmapping = &parse_field_definition_table($fdtfilename, $encoding);
 
     # Map the tag numbers to tag names, using the FDT mapping
@@ -252 +252 @@
 {
     my $fdtfilename = shift(@_);
+    my $encoding = shift(@_);
 
     my %fdtmapping = ();
@@ -257 +258 @@
     open(FDT_FILE, "<$fdtfilename") || die "Error: Could not open file $fdtfilename.\n";
 
+    my $fdtfiletext = "";
+    my $reader = new multiread();
+    $reader->set_handle('ISISPlug::FDT_FILE');
+    $reader->set_encoding($encoding);
+    $reader->read_file($fdtfiletext);
+
     my $amongstdefinitions = 0;
-    foreach my $fdtfileline (<FDT_FILE>) {
+    foreach my $fdtfileline (split(/\n/, $$fdtfiletext)) {
     $fdtfileline =~ s/(\s*)$//;  # Remove any nasty spaces at the end of the lines
 
@@ -271 +278 @@
 
         # Map from tag number to metadata field title and subfields
-        my $fieldtag = (split(/ /, $fieldspecs))[0];
+        my ($fieldtag) = ($fieldspecs =~ /^\s*(\d+)\s+/);
         $fdtmapping{$fieldtag} = { 'title' => $fieldtitle,
                        'subfields' => $fieldsubfields };