--- trunk/parse_format.pm	2003/01/16 17:35:54	10
+++ trunk/parse_format.pm	2003/06/23 20:20:32	54
@@ -1,40 +1,74 @@
 #-------------------------------------------------------------
 #
-# parse_format('format',$isis_row);
+# parse_format(...)
 #
 
-use isis_sf;
 
 sub parse_format {
+	my $type = shift || die "parset_format must be called with type!";
+	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!";
+	if ($type eq "isis") {
+		return parse_isis_format($format,$row,$i,$codepage);
+	} elsif ($type eq "excel") {
+		return parse_excel_format($format,$row,$i,$codepage);
+	}
+}
+
+#-------------------------------------------------------------
+
+sub parse_isis_format {
+	use isis_sf;
+
 	my $format = shift;
 	my $row = shift;
+	my $i = shift;
+	my $codepage = shift;
 
 	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) {
+				$isis_tmp = $codepage->convert($isis_tmp) if ($codepage);
+				$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,undef,$i);
 			if ($isis_tmp) {
+				$isis_tmp = $codepage->convert($isis_tmp) if ($codepage);
 				$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;
@@ -48,4 +82,49 @@
 }
 
 #-------------------------------------------------------------
+
+sub parse_excel_format {
+	my $format = shift;
+	my $row = shift;
+	my $i = shift;
+	my $codepage = shift;
+
+	my $out;
+	my $out_swish;
+
+	my $prefix = "";
+	if ($format =~ s/^([^A-Z\|]{1,3})//) {
+		$prefix = $1;
+	}
+
+	my $display;
+	my $swish;
+
+	while ($format && length($format) > 0) {
+#print STDERR "\n#### $format #";
+		if ($format =~ s/^\|([A-Z]{1,2})\|//) {
+#print STDERR "--$1-> $format -[",length($format),"] ";
+			if ($row->{$1}) {
+				my $tmp = $row->{$1};
+				$tmp = $codepage->convert($tmp) if ($codepage);
+				$display .= $prefix . $tmp;
+				$swish .= $tmp." ";
+#print STDERR " == $tmp";
+			}
+			$prefix = "";
+		} elsif ($format =~ s/^([^A-Z\|]+)(\|[A-Z]{1,2}\|)/$2/) {
+			$prefix .= $1 if ($display);
+		} else {
+			print STDERR "unparsed format: $format\n";
+			$prefix .= $format;
+			$format = "";
+		}
+#print STDERR " display: $display swish: $swish [format: $format]";
+	}
+	# add suffix
+	$display .= $prefix if ($display);
+
+	return ($swish,$display);
+}
+
 1;