--- branches/cpi/isis_sf.pm	2005/01/16 18:35:24	632
+++ branches/cpi/isis_sf.pm	2005/01/16 18:57:15	633
@@ -15,14 +15,12 @@
 	if ($row->{$isis_id}->[$i]) {
 		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;	
 		}
-		my $sf = OpenIsis::subfields($row->{$isis_id}->[$i]);
-		if ($sf->{$subfield}) {
-			return $sf->{$subfield};
-		}
+		my $sf = $row->{$isis_id}->[$i]->{$subfield};
+		return $sf if ($sf);
 	}
 }