X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=isis_sf.pm;h=f118318dd4c844f963cdf1aae2cc1ad5ff50b976;hb=993e7f130dc12943adddb757e26d24254fd8c50b;hp=2a9951f91b875f66af83968d35315c0684e4e36a;hpb=bea29ddf60ae741affde5d8c893aacf48637fc17;p=webpac

diff --git a/isis_sf.pm b/isis_sf.pm
index 2a9951f..f118318 100644
--- a/isis_sf.pm
+++ b/isis_sf.pm
@@ -13,15 +13,14 @@ sub isis_sf {
 	my $out;
 
 	if ($row->{$isis_id}->[$i]) {
-		my $sf = OpenIsis::subfields($row->{$isis_id}->[$i]);
-		if (! defined $subfield || length($subfield) == 0) {
+		if (! $subfield) {
 			# subfield list undef, empty or no defined subfields for this record
-			my $all_sf = $row->{$isis_id}->[$i];
-			$all_sf =~ s/\^./ /g;	# nuke definitions
+			my $all_sf = $row->{record}->{$isis_id}->[$i];
+			$all_sf =~ s/\^./ /g;   # nuke definitions
 			return $all_sf;	
-		} elsif ($sf->{$subfield}) {
-			return $sf->{$subfield};
 		}
+		my $sf = $row->{$isis_id}->[$i]->{$subfield};
+		return $sf if ($sf);
 	}
 }