--- trunk/parse_format.pm	2003/03/23 01:14:59	46
+++ trunk/parse_format.pm	2003/06/23 20:20:32	54
@@ -1,15 +1,31 @@
 #-------------------------------------------------------------
 #
-# 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;
@@ -66,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;