X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=marc_sf.pm;h=4da5eae752089d48686d83ff9a448601c5fd9828;hb=6a631ecdcd789163702283df7d9a58e6fd0a8869;hp=7e2c6719b80facf0f3d4f2725ca0f44e70779585;hpb=7073f1c1ca5d3c3ccc47e6a2551411113cb9724f;p=webpac

diff --git a/marc_sf.pm b/marc_sf.pm
index 7e2c671..4da5eae 100644
--- a/marc_sf.pm
+++ b/marc_sf.pm
@@ -4,13 +4,19 @@
 # e.g. marc_sf($row,'700','a')
 #
 sub marc_sf {
-	my $marc = shift @_;
-	my $f = shift @_;
+	my $marc = shift @_ || die "marc_sf: needs record";
+	my $f = shift @_ || die "marc_sf: needs field name";
 	my $s = shift @_;
 
 	my $i = shift @_ || 0;
 
-	my @out = $marc->getvalue({record=>$marc->marc_count(),field=>$f,subfield=>$s,delimiter=>" "});
+	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]);
 }