--- trunk/lib/WebPAC/Normalize/MARC.pm	2007/11/10 11:13:58	1023
+++ trunk/lib/WebPAC/Normalize/MARC.pm	2007/11/11 13:47:43	1026
@@ -42,6 +42,8 @@
 		],
 	);
 
+Returns number of records produced.
+
 =cut
 
 sub marc_template {
@@ -78,37 +80,40 @@
 	warn "### from_subfields = ", dump( $from_subfields ),$/;
 	warn "### to_subfields = ", dump( $to_subfields ),$/;
 
-	my $fields_re = join('|', keys %$to_subfields );
+	our $_template;
 
-	my $fill_in;
-	my @marc_out;
+	$_template->{isis}->{fields_re} = join('|', keys %$from_subfields );
+	$_template->{marc}->{fields_re} = join('|', keys %$to_subfields );
 
-	my $marc_template;
-	_parse_template( $args->{marc_template}, $marc_template );
+	my @marc_out;
 
 	sub _parse_template {
-		my ( $templates, $marc_template_order ) = @_;
+		my ( $name, $templates ) = @_;
+
+		my $fields_re = $_template->{$name}->{fields_re} || die "can't find $name in ",dump( $_template->{$name}->{fields_re} );
 
 		foreach my $template ( @{ $templates } ) {
 			our $count = {};
-			our @marc_order = ();
+			our @order = ();
 			sub my_count {
 				my $sf = shift;
 				my $nr = $count->{$sf}++;
-				push @marc_order, [ $sf, $nr ];
+				push @order, [ $sf, $nr ];
 				return $sf . $nr;
 			}
 			my $pos_template = $template;
 			$pos_template =~ s/($fields_re)/my_count($1)/ge;
 			my $count_key = dump( $count );
-			warn "### template: |$template| -> |$pos_template| count = $count_key marc_order = ",dump( @marc_order ),$/;
-			$marc_template->{pos}->{ $count_key } = $pos_template;
-			$marc_template->{order}->{ $pos_template } = [ @marc_order ];
+			warn "### template: |$template| -> |$pos_template| count = $count_key order = ",dump( @order ),$/;
+			$_template->{$name}->{pos}->{ $count_key } = $pos_template;
+			$_template->{$name}->{order}->{ $pos_template } = [ @order ];
 		}
-		warn "### from ",dump( $templates ), " created ", dump( $marc_template );
+		warn "### from ",dump( $templates ), " using $fields_re created ", dump( $_template );
 	}
 
-	warn "### marc_template = ",dump( $marc_template );
+	_parse_template( 'marc', $args->{marc_template} );
+	_parse_template( 'isis', $args->{isis_template} );
+	warn "### _template = ",dump( $_template );
 
 	my $m;
 
@@ -120,7 +125,7 @@
 
 		warn "### r = ",dump( $r );
 
-		my ( $new_r, $from_count, $to_count );
+		my ( $from_mapping, $to_mapping, $from_count, $to_count );
 		foreach my $sf ( keys %{$r} ) {
 			# skip everything which isn't one char subfield (e.g. 'subfields')
 			next unless $sf =~ m/^\w$/;
@@ -129,69 +134,97 @@
 				die "can't find subfield rename for $sf/$nr in ", dump( $subfields_rename );
 			warn "### rename $sf/$nr to ", dump( $rename_to->[$nr] ), $/;
 			my ( $to_sf, $to_nr ) = @{ $rename_to->[$nr] };
-			$new_r->{ $to_sf }->[ $to_nr ] = [ $sf => $nr ];
+			$from_mapping->{ $sf }->[ $nr ] = [ $to_sf => $to_nr ];
+			$to_mapping->{ $to_sf }->[ $to_nr ] = [ $sf => $nr ];
 
 			$to_count->{ $to_sf }++;
 		}
 
-		warn "### new_r = ",dump( $new_r );
+		warn "### to_mapping = ",dump( $to_mapping );
 
-		my $from_count_key = dump( $to_count );
+		my $count_key = {
+			from => dump( $from_count ),
+			to   => dump( $to_count),
+		};
+
+		warn "### count_key = ",dump( $count_key ), $/;
+
+		my $processed_templates = 0;
+
+		# this defines order of traversal
+		foreach ( qw/isis:from marc:to/ ) {
+			my ($name,$count_name) = split(/:/);
+
+			my $ckey = $count_key->{$count_name} || die "can't find count_key $count_name in ",dump( $count_key );
+
+			my $template = $_template->{$name}->{pos}->{ $ckey } || next;
+			$processed_templates++;
+
+			warn "### traverse $name $count_name selected template: |$template|\n";
+
+			our $fill_in = {};
+
+			my @templates = split(/\|/, $template );
+			@templates = ( $template );
+
+			foreach my $sf ( @templates ) {
+				sub fill_in {
+					my ( $name, $r, $sf, $nr ) = @_;
+					my ( $from_sf, $from_nr, $v );
+					if ( $name eq 'marc' ) {
+						( $from_sf, $from_nr ) = @{ $to_mapping->{$sf}->[$nr] };
+					} else {
+						( $from_sf, $from_nr ) = ( $sf, $nr );
+					}
+					my $v = $r->{ $from_sf }; # || die "no $from_sf/$from_nr";
+					warn "#### fill_in( $sf, $nr ) = $from_sf/$from_nr >>>> ",dump( $v ), $/;
+					if ( ref( $v ) eq 'ARRAY' ) {
+						$fill_in->{$sf}->[$nr] = $v->[$from_nr];
+						return $v->[$from_nr];
+					} elsif ( $from_nr == 0 ) {
+						$fill_in->{$sf}->[$nr] = $v;
+						return $v;
+					} else {
+						die "requested subfield $from_sf/$from_nr but it's ",dump( $v );
+					}
+				}
+				my $fields_re = $_template->{$name}->{fields_re} || die "can't find $name in ",dump( $_template->{$name}->{fields_re} );
+				warn "#### $sf <<<< $fields_re\n";
+				$sf =~ s/($fields_re)(\d+)/fill_in($name,$r,$1,$2)/ge;
+				warn "#### >>>> $sf with fill_in = ",dump( $fill_in ),$/;
+			}
 
-		warn "### from_count = ",dump( $from_count ), $/;
-		warn "### to_count   = ",dump( $to_count ), $/;
+			warn "## template: |$template|\n## _template->$name = ",dump( $_template->{$name} );
 
-		my $template = $marc_template->{pos}->{ $from_count_key } ||
-			die "I don't have template for:\n$from_count_key\n## available templates\n", dump( $marc_template->{pos} );
-
-		warn "### selected template: |$template|\n";
-
-		$fill_in = {};
-
-		my @templates = split(/\|/, $template );
-		@templates = ( $template );
-
-		foreach my $sf ( @templates ) {
-			sub fill_in {
-				my ( $r, $sf, $nr ) = @_;
-				my ( $from_sf, $from_nr ) = @{ $new_r->{ $sf }->[ $nr ] };
-				my $v = $r->{ $from_sf }; # || die "no $from_sf/$from_nr";
-				warn "#### fill_in( $sf, $nr ) = $from_sf/$from_nr >>>> ",dump( $v ), $/;
-				if ( ref( $v ) eq 'ARRAY' ) {
-					$fill_in->{$sf}->[$nr] = $v->[$from_nr];
-					return $v->[$from_nr];
-				} elsif ( $from_nr == 0 ) {
-					$fill_in->{$sf}->[$nr] = $v;
-					return $v;
-				} else {
-					die "requested subfield $from_sf/$from_nr but it's ",dump( $v );
+			foreach my $sf ( @{ $_template->{$name}->{order}->{$template} } ) {
+				my ( $sf, $nr ) = @$sf;
+				my $v = $fill_in->{$sf}->[$nr] || die "can't find fill_in $sf/$nr";
+				if ( $name eq 'isis') {
+					( $sf, $nr ) = @{ $from_mapping->{$sf}->[$nr] };
 				}
+				warn "++ $sf/$nr |$v|\n";
+				push @$m, ( $sf, $v );
 			}
-			warn "#### $sf <<<< $fields_re\n";
-			$sf =~ s/($fields_re)(\d+)/fill_in($r,$1,$2)/ge;
-			warn "#### >>>> $sf with fill_in = ",dump( $fill_in ),$/;
-		}
 
-		warn "## template: |$template|\n## marc_template = ",dump( $marc_template );
+			warn "#### >>>> created MARC record: ", dump( $m );
 
-		foreach my $sf ( @{ $marc_template->{order}->{$template} } ) {
-			my ( $sf, $nr ) = @$sf;
-			my $v = $fill_in->{$sf}->[$nr] || die "can't find fill_in $sf/$nr";
-			warn "++ $sf/$nr |$v|\n";
-			push @$m, ( $sf, $v );
+			push @marc_out, $m;
 		}
-
-		warn "#### >>>> created marc: ", dump( $m );
-
-		push @marc_out, $m;
+	
+		die "I don't have template for fields ",dump( $count_key ), "\n## available templates\n", dump( $_template ) unless $processed_templates;
+		warn ">>> $processed_templates templates applied to data\n";
 	}
 
-	warn "### marc_template produced: ",dump( @marc_out );
+
+	my $recs = 0;
 
 	foreach my $marc ( @marc_out ) {
-		warn "+++ ",dump( $marc );
+		warn "+++ ",dump( $marc ),$/;
 		WebPAC::Normalize::_marc_push( $marc );
+		$recs++;
 	}
+
+	warn "### marc_template produced $recs MARC records: ",dump( @marc_out ), $/;
 }
 
 1;