my ($r, $filename, $id, $dbwidth, $dbheight, $infobox, $xres, $yres, @otherres) = @_;
my $fname = get_disk_location($r, $id);
my ($r, $filename, $id, $dbwidth, $dbheight, $infobox, $xres, $yres, @otherres) = @_;
my $fname = get_disk_location($r, $id);
- push @classic_fields, [ $info->{'NikonD1-ISOSetting'}->[1] . " ISO", 0 ];
- } elsif (defined($info->{'ISOSetting'})) {
- push @classic_fields, [ $info->{'ISOSetting'} . " ISO" ];
+ $iso = $info->{'NikonD1-ISOSetting'};
- push @classic_fields, [ $info->{'ISO'} . " ISO" ];
+ $iso = $info->{'ISO'};
+ } elsif (defined($info->{'ISOSetting'})) {
+ $iso = $info->{'ISOSetting'};
+ }
+ if (defined($iso) && $iso =~ /(\d+)/) {
+ push @classic_fields, [ $1 . " ISO", 0 ];