--- trunk/parse_format.pm	2003/02/23 00:01:08	22
+++ trunk/parse_format.pm	2003/03/22 22:43:05	43
@@ -6,45 +6,63 @@
 use isis_sf;
 
 sub parse_format {
-	my $format = shift;
-	my $row = shift;
+	my $format = shift || die "parse_format must be called with format!";
+	my $row = shift || die "parse_format must be called with row!";
+	my $i = shift || 0;	# isis repeatable number
+	my $codepage = shift || die "parse_format must be called with codepage!";
 
 	my $out;
 	my $out_swish;
 
 	my $prefix = "";
 	if ($format =~ s/^([^\d]+)//) {
-		$prefix = "pre: $1";
+		$prefix = $1;
 	}
 
 	my $display;
 	my $swish;
 
 	while ($format) {
-#print STDERR "#### $format\n";
+#print STDERR "\n#### $format";
 		if ($format =~ s/^(\d\d\d)(\w?)//) {
-			my $isis_tmp = isis_sf($row,$1,$2);
+			my $isis_tmp = isis_sf($row,$1,$2,$i);
 			if ($isis_tmp) {
+				eval {
+					$isis_tmp = $codepage->convert($isis_tmp) if ($codepage);
+				};
+				if ($@) {
+					print STDERR "FATAL: something bad happend while trying to convert '$isis_tmp' [mfn: ",$row->{mfn},"]\n"
+				}
 				$display .= $prefix . $isis_tmp;
 				$swish .= $isis_tmp." ";
+#print STDERR " == $isis_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,$2);
+			my $isis_tmp = isis_sf($row,$1,undef,$i);
 			if ($isis_tmp) {
+				eval {
+					$isis_tmp = $codepage->convert($isis_tmp) if ($codepage);
+				};
+				if ($@) {
+					print STDERR "FATAL: something bad happend while trying to convert '$isis_tmp' [mfn: ",$row->{mfn},"]\n"
+				}
 				$display .= $prefix . $isis_tmp;
 				$swish .= $isis_tmp." ";
 			}
 			$prefix = "";
+		} elsif ($format =~ s/^mfn//i) {
+			$display .= $prefix . $row->{mfn};
+			$prefix = "";
 		} elsif ($format =~ s/^([^\d]+)(\d{0,3})/$2/) {
-			$prefix .= $1;
+			$prefix .= $1 if ($display);
 		} elsif ($format =~ s/^([^\d]+\d{0,2})//) {
-			$prefix .= $1;
+			$prefix .= $1 if ($display);
 		} elsif ($format =~ s/^(\d{1,2})//) {
-			$prefix .= $1;
+			$prefix .= $1 if ($display);
 		} else {
 			print STDERR "unparsed format: $format\n";
 			$prefix .= $format;