X-Git-Url: http://git.equinoxoli.org/?p=migration-tools.git;a=blobdiff_plain;f=extract_holdings;h=27cf58a419ad361aec61220d80d5d432a53eb4da;hp=0ef270a47501df7e17ed57943b88e95da6939c53;hb=7a654b50c2edbb1f746895a2e73e6038e59d6e93;hpb=a08f66cfeb74ddef098fa4c07846e0af5df4ba66

diff --git a/extract_holdings b/extract_holdings
index 0ef270a..27cf58a 100755
--- a/extract_holdings
+++ b/extract_holdings
@@ -39,7 +39,7 @@ sub extract_holdings {
     my $multis = $m->get_multis;
     my %MULTIFILE = ();
     for my $t ( keys %{$multis} ) {
-        for my $s ( keys %{$t}) 
+        for my $s ( keys %{$multis->{$t}}) 
           { open my $fh, ">", ($c->{prefix} . "-HOLDINGS-MULT-$t$s.pg"); $MULTIFILE{"$t$s"} = $fh }
     }
 
@@ -47,12 +47,14 @@ sub extract_holdings {
     my $j = 0; # holdings counter
 
     while (  $m->{data}{recs}[$i] ) {
-        print HOLDINGS "BEGIN;\n\negid\thseq\t" unless $j;
+        print HOLDINGS "BEGIN;\n\negid, hseq, " unless $j;
         my $rec = $m->{data}{recs}[$i];
-
+        my $k = 0; # holding-within-record pointer
         # for each holdings tag in the record...
-        for my $holdidx ( @{$rec->{tmap}{ $c->{holdings} }} ) {
+        while ( defined $rec->{tmap}{ $c->{holdings} }[$k] ) {
+            my $holdidx = $rec->{tmap}{ $c->{holdings} }[$k];
             my $tagid = $rec->{tags}[$holdidx]{tag};
+            $k++;
 
             my @out = ();            # clear the output buffer
             push @out, $rec->{egid}; # slug in the egid first thing
@@ -61,13 +63,15 @@ sub extract_holdings {
             # grab the unary mappings and slug 'em in
             for my $sub ( sort keys %{$rec->{tags}[$holdidx]{uni}} ) {
                 push @out, $rec->{tags}[$holdidx]{uni}{$sub};
-                print HOLDINGS "l_", $m->name($tagid, $sub),"\t" unless $j;
+                print HOLDINGS "l_", $m->name($tagid, $sub),", " unless $j;
             }
 
             # handle holdings multis
             for my $sub ( sort keys %{$multis->{$tagid}} ) {
-                for my $value ( @{$rec->{tags}[$holdidx]{multi}{$sub}} ) 
-                  { my $fh = $MULTIFILE{"$tagid$sub"}; print $fh join("\t", $rec->{egid}, $j, $value), "\n" }
+                for my $value ( @{$rec->{tags}[$holdidx]{multi}{$sub}} ) {
+                  my $fh = $MULTIFILE{"$tagid$sub"};
+                  print $fh join("\t", $rec->{egid}, $j, $value), "\n";
+              }
             }
 
 
@@ -77,7 +81,7 @@ sub extract_holdings {
                 my $idx = $rec->{tmap}{$othertag}[0]; # get index into tags struct
                 for my $sub ( sort keys %{$rec->{tags}[$idx]{uni}} ) {
                     push @out, $rec->{tags}[$idx]{uni}{$sub};
-                    print "l_", $m->name($rec->{tags}[$idx]{tag}, $sub), "\t"
+                    print HOLDINGS "l_", $m->name($rec->{tags}[$idx]{tag}, $sub), ", "
                       unless $j;
                 }
             }
@@ -87,6 +91,8 @@ sub extract_holdings {
             print HOLDINGS join("\t", @out);
             print HOLDINGS "\n";
             $j++;
+
+            @out = undef;
         }
         $i++;
         print "\r$i";