--- trunk/all2xml.pl	2004/02/01 22:06:00	215
+++ trunk/all2xml.pl	2004/02/08 20:16:54	224
@@ -321,7 +321,7 @@
 					} else {
 						$display_data .= $ldel if ($display_data);
 						my $tmp = mkformat($x,$display);
-						$display_data = $tmp if ($tmp);
+						$display_data .= $tmp if ($tmp);
 					}
 				}
 						
@@ -789,14 +789,14 @@
 		my $marc_file = $cfg -> val($database, 'marc_file') || die "$database doesn't have 'marc_file' defined!";
 
 		# optional argument is format
-		my $format = x($config->{format}) || 'usmarc';
+		my $format = x($config->{marc_format}) || 'usmarc';
 
 		print STDERR "Reading MARC file '$marc_file'\n";
 
 		my $marc = new MARC;
 		my $nr = $marc->openmarc({
 				file=>$marc_file, format=>$format
-			}) || die "Can't open MARC file '$marc_file'";
+			}) || die "Can't open MARC file '$marc_file' with format '$format'";
 
 		# read MARC file in memory
 		$marc->nextmarc(-1);