--- trunk/parse_format.pm	2003/06/23 20:20:32	54
+++ trunk/parse_format.pm	2003/07/04 20:11:48	62
@@ -11,22 +11,27 @@
 	my $i = shift || 0;	# isis repeatable number
 	my $codepage = shift || die "parse_format must be called with codepage!";
 	if ($type eq "isis") {
-		return parse_isis_format($format,$row,$i,$codepage);
+		return parse_iso_format($format,$row,$i,$codepage,'isis_sf');
 	} elsif ($type eq "excel") {
 		return parse_excel_format($format,$row,$i,$codepage);
+	} elsif ($type eq "marc") {
+		return parse_iso_format($format,$row,$i,$codepage,'marc_sf');
 	}
 }
 
 #-------------------------------------------------------------
 
-sub parse_isis_format {
-	use isis_sf;
+sub parse_iso_format {
 
 	my $format = shift;
 	my $row = shift;
 	my $i = shift;
 	my $codepage = shift;
 
+	my $func = shift || die "need to know which sub-field function to use";
+
+	require $func.".pm";
+
 	my $out;
 	my $out_swish;
 
@@ -38,26 +43,34 @@
 	my $display;
 	my $swish;
 
+	sub cnv_cp {
+		my $tmp = shift;
+		if ($codepage) {
+			$tmp = $codepage->convert($tmp) || print STDERR "$1$2 = '$tmp' can't convert";
+		}
+		return $tmp;
+	}
+
 	while ($format) {
 #print STDERR "\n#### $format";
-		if ($format =~ s/^(\d\d\d)(\w?)//) {
-			my $isis_tmp = isis_sf($row,$1,$2,$i);
-			if ($isis_tmp) {
-				$isis_tmp = $codepage->convert($isis_tmp) if ($codepage);
-				$display .= $prefix . $isis_tmp;
-				$swish .= $isis_tmp." ";
-#print STDERR " == $isis_tmp";
+		# this is EBSCO special to support numeric subfield in
+		# form of 856#3
+		if ($format =~ s/^(\d\d\d)#*(\w?)//) {
+			my $tmp = get_sf($row,$1,$2,$i);
+			if ($tmp) {
+				$display .= $prefix.cnv_cp($tmp);
+				$swish .= $tmp." ";
+#print STDERR " == $tmp";
 			}
 			$prefix = "";
 		# this might be our local scpeciality -- fields 10 and 11
 		# (as opposed to 010 and 011) so they are strictly listed
 		# here
 		} elsif ($format =~ s/^(1[01])//) {
-			my $isis_tmp = isis_sf($row,$1,undef,$i);
-			if ($isis_tmp) {
-				$isis_tmp = $codepage->convert($isis_tmp) if ($codepage);
-				$display .= $prefix . $isis_tmp;
-				$swish .= $isis_tmp." ";
+			my $tmp = get_sf($row,$1,undef,$i);
+			if ($tmp) {
+				$display .= $prefix.cnv_cp($tmp);
+				$swish .= $tmp." ";
 			}
 			$prefix = "";
 		} elsif ($format =~ s/^mfn//i) {
@@ -106,7 +119,9 @@
 #print STDERR "--$1-> $format -[",length($format),"] ";
 			if ($row->{$1}) {
 				my $tmp = $row->{$1};
-				$tmp = $codepage->convert($tmp) if ($codepage);
+				if ($codepage) {
+					$tmp = $codepage->convert($tmp) || warn "excel: $1 '$tmp' can't convert";
+				}
 				$display .= $prefix . $tmp;
 				$swish .= $tmp." ";
 #print STDERR " == $tmp";