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

diff --git a/extract_holdings b/extract_holdings
index fadcf8d..27cf58a 100755
--- a/extract_holdings
+++ b/extract_holdings
@@ -47,12 +47,11 @@ 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...
-        while ( $rec->{tmap}{ $c->{holdings} }[$k] ) {
+        while ( defined $rec->{tmap}{ $c->{holdings} }[$k] ) {
             my $holdidx = $rec->{tmap}{ $c->{holdings} }[$k];
             my $tagid = $rec->{tags}[$holdidx]{tag};
             $k++;
@@ -64,7 +63,7 @@ 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
@@ -82,7 +81,8 @@ 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" unless $j;
+                    print HOLDINGS "l_", $m->name($rec->{tags}[$idx]{tag}, $sub), ", "
+                      unless $j;
                 }
             }