--- trunk/marc_sf.pm	2003/11/23 15:39:23	169
+++ branches/cpi/marc_sf.pm	2005/01/16 18:57:15	633
@@ -10,7 +10,12 @@
 
 	my $i = shift @_ || 0;
 
-	my @out = $marc->getvalue({record=>$marc->marc_count(),field=>$f,subfield=>$s});
+	my @out;
+	if ($s) {
+		@out = $marc->subfield($f,$s);
+	} else {
+		@out = $marc->field($f)->as_string() if ($marc->field($f));
+	}
 
 	return $out[$i] if (@out && $out[$i]);
 }