X-Git-Url: http://git.equinoxoli.org/?p=migration-tools.git;a=blobdiff_plain;f=extract_holdings;h=028378d4e063d7bc67087e551d20d150952ad6a9;hp=2cce0009068162dc70c3711aa869e8872d24cbac;hb=ed7dae56be7fb1dece7fdb5caaea8903c13b32cd;hpb=c9294d8a92619c2fe31d6b3843ad1593eddddebb

diff --git a/extract_holdings b/extract_holdings
index 2cce000..028378d 100755
--- a/extract_holdings
+++ b/extract_holdings
@@ -53,13 +53,13 @@ sub extract_holdings {
 
     print "Writing holdings to output file(s)...\n";
     # open main holdings file
-    open HOLDINGS, '>', ($c->{prefix} . "-HOLDINGS.pg");
+    open HOLDINGS, '>', ($c->{prefix} . "-" . $c->{suffix} . ".pg");
     # create multi files
     my $multis = $m->get_multis;
     my %MULTIFILE = ();
     for my $t ( keys %{$multis} ) {
         for my $s ( keys %{$multis->{$t}}) 
-          { open my $fh, ">", ($c->{prefix} . "-HOLDINGS-MULT-$t$s.pg"); $MULTIFILE{"$t$s"} = $fh }
+          { open my $fh, ">", ($c->{prefix} . "-" . $c->{suffix} . "-MULT-$t$s.pg"); $MULTIFILE{"$t$s"} = $fh }
     }
 
     my $parallel_fields = $m->get_parallel_fields;
@@ -91,7 +91,9 @@ sub extract_holdings {
             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";
+                  my $clean_value = $value;
+                  $clean_value =~ s/[\r\n\t]//g;
+                  print $fh join("\t", $rec->{egid}, $j, $clean_value), "\n";
               }
             }
 
@@ -140,7 +142,9 @@ sub extract_holdings {
                         next if $m->first_only($rec->{tags}[$tag_idx]{tag}, $sub) and ($k > 1);
                         for my $value ( @{$rec->{tags}[$tag_idx]{multi}{$sub}} ) {
                             my $fh = $MULTIFILE{"$othertag$sub"};
-                            print $fh normalize_output(join("\t", $rec->{egid}, $j, $value)), "\n";
+                            my $clean_value = $value;
+                            $clean_value =~ s/[\r\n\t]//g;
+                            print $fh normalize_output(join("\t", $rec->{egid}, $j, $clean_value)), "\n";
                         }
                     }
                 }
@@ -184,7 +188,7 @@ sub dump_sample_detail {
     my $count = $s->{data}{rcnt};
     my $scnt  = $s->{data}{scnt};
 
-    open DETAIL, '>', ($c->{prefix} . "-HOLDINGS-DETAIL.txt");
+    open DETAIL, '>', ($c->{prefix} . "-" . $c->{suffix} . "-DETAIL.txt");
     select DETAIL;
     for my $tag (sort keys %{ $tags }) {
         print ">>>>> TAG $tag\n\n";
@@ -196,7 +200,7 @@ sub dump_sample_detail {
         print "\n";
     }
     close DETAIL;
-    open SCOUNT, '>', ($c->{prefix} . "-HOLDINGS-SUBCOUNTS.txt");
+    open SCOUNT, '>', ($c->{prefix} . "-" . $c->{suffix} . "-SUBCOUNTS.txt");
     select SCOUNT;
     for my $tag (sort keys %{ $scnt }) {
         print ">>>>> TAG $tag\n\n";
@@ -205,8 +209,8 @@ sub dump_sample_detail {
         print "\n";
     }
     select STDOUT;
-    print "Saved results as ", ($c->{prefix} . "-HOLDINGS-DETAIL.txt"), " and ",
-        ($c->{prefix} . "-HOLDINGS-SUBCOUNTS.txt"), "\n";
+    print "Saved results as ", ($c->{prefix} . "-" . $c->{suffix} . "-DETAIL.txt"), " and ",
+        ($c->{prefix} . "-" . $c->{suffix} . "-SUBCOUNTS.txt"), "\n";
 }
 
 sub dump_sample_overview {
@@ -217,7 +221,7 @@ sub dump_sample_overview {
     my @tagsbyname  = sort keys %{$tags};
     my @tagsbycount = reverse sort { $tags->{$a} <=> $tags->{$b} } keys %{$tags};
 
-    open SAMPLE, '>', ($c->{prefix} . "-HOLDINGS-OVERVIEW.txt");
+    open SAMPLE, '>', ($c->{prefix} . "-" . $c->{suffix} . "-OVERVIEW.txt");
     select SAMPLE;
     print "SAMPLE REPORT FOR ", $c->{prefix},": $count records\n\n";
     print "FOUND TAGS (BY TAG)           FOUND TAGS (BY COUNT)\n";
@@ -232,7 +236,7 @@ sub dump_sample_overview {
         print " (", sprintf("%03d", int($tags->{ $tagsbycount[$i] } / $count * 100)), "%)\n";
     }
     select STDOUT;
-    print "Saved results as ", ($c->{prefix} . "-HOLDINGS-OVERVIEW.txt"), "\n";
+    print "Saved results as ", ($c->{prefix} . "-" . $c->{suffix} . "-OVERVIEW.txt"), "\n";
     close SAMPLE;
 }
 
@@ -254,6 +258,7 @@ sub initialize {
                          'holdings|h=i',
                          'copyid|c=s',
                          'prefix|p=s',
+                         'suffix|o=s',
                          'disable-pg-normalization',
                          'version|v',
                          'help',
@@ -266,6 +271,9 @@ sub initialize {
       if ($c->{map} and !($c->{holdings} and $c->{copyid}));
     show_version() if $c->{version};
 
+    if (! $c->{suffix}) {
+        $c->{suffix} = 'HOLDINGS';
+    }
     if ($c->{prefix} and !$c->{marcfile}) {
         $c->{marcfile} = $c->{prefix} . ".clean.marc.xml";
     }
@@ -296,6 +304,7 @@ Usage is: extract_holdings --prefix PREFIX --marcfile MARCFILE [ARGUMENTS]
 
 REQUIRED ARGUMENTS
   --prefix   -p  Prefix string for output filenames
+  --suffix   -o  Suffix string for output filenames (defaults to HOLDINGS)
   --marcfile     MARCXML to use as source data
                  Defaults to 'PREFIX.clean.marc.xml'