--- trunk/isis_sf.pm	2003/02/23 07:08:54	29
+++ trunk/isis_sf.pm	2004/12/31 04:22:49	619
@@ -13,15 +13,14 @@
 	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);
 	}
 }