--- trunk/lib/WebPAC/Normalize.pm	2006/08/23 14:29:43	616
+++ trunk/lib/WebPAC/Normalize.pm	2006/08/25 12:31:06	619
@@ -540,8 +540,12 @@
 
 	warn "### marc_compose input subfields = ", dump(@_),$/ if ($debug > 2);
 
+	if ($#_ % 2 != 1) {
+		die "ERROR: marc_compose",dump($f,@_)," not valid (must be even).\nDo you need to add first() or join() around some argument?\n";
+	}
+
 	while (@_) {
-		my $sf = shift or die "marc_compose $f needs subfield";
+		my $sf = shift;
 		my $v = shift;
 
 		next unless (defined($v) && $v !~ /^\s*$/);
@@ -683,12 +687,13 @@
 
 		die "field $from doesn't have even number of subfields specifications\n" unless($#sfs % 2 == 1);
 
-warn "#--> d: ",dump($d), "\n#--> sfs: ",dump(@sfs),$/;
+		warn "#--> d: ",dump($d), "\n#--> sfs: ",dump(@sfs),$/ if ($debug > 2);
 
 		my $m = [ $to, $i1, $i2 ];
 
 		while (my $sf = shift @sfs) {
-warn "#--> sf: ",dump($sf), $/;
+
+			warn "#--> sf: ",dump($sf), $/ if ($debug > 2);
 			my $offset = shift @sfs;
 			die "corrupted sufields specification for field $from\n" unless defined($offset);
 
@@ -709,8 +714,6 @@
 	}
 
 	warn "## marc_record = ", dump( $marc_record ),$/ if ($debug > 1);
-
-	warn "# marc_original_order is partly implemented";
 }