simplifying defaults a bit

[migration-tools.git] / emig.d / bin / mig-reporter

diff --git a/emig.d/bin/mig-reporter b/emig.d/bin/mig-reporter
index f87059e..40285b1 100755 (executable)
--- a/emig.d/bin/mig-reporter
+++ b/emig.d/bin/mig-reporter
@@ -61,7 +61,7 @@ use Cwd qw(getcwd);
 use FindBin;
 my $mig_bin = "$FindBin::Bin/";
 use lib "$FindBin::Bin/";
-use Mig;
+use EMig;
 use open ':encoding(utf8)';
 
 pod2usage(-verbose => 2) if defined $ARGV[0] && $ARGV[0] eq '--help';
@@ -70,7 +70,7 @@ pod2usage(-verbose => 1) if ! $ARGV[1];
 my $analyst = 'Equinox Open Library Initiative';;
 my $report_title;
 my $reports_xml = 'evergreen_staged_report.xml';
-my $tags;
+my $tags = 'circs.holds.actors.bibs.assets.money.notices';
 my $added_page_title;
 my $added_page_file;
 my $captions = 'off';  
@@ -93,9 +93,7 @@ my $ret = GetOptions(
        'debug:s'             => \$debug
 );
 
-if (!defined $tags) {$tags = 'circs.holds.actors.bibs.assets.money.notices'};
 if (!defined $report_title) { abort('--report_title or --title must be supplied'); }
-if (!defined $analyst) { abort('--analyst must be supplied'); }
 
 my $mig_path = abs_path($0);
 $mig_path =~ s|[^/]+$||;
@@ -108,7 +106,7 @@ if (defined $added_page_file or defined $added_page_title) {
     }
 if (defined $added_page_file) { $added_page_file = $MIGGITDIR . $added_page_file; }
 
-my $dbh = Mig::db_connect();
+my $dbh = EMig::db_connect();
 my $report_file = create_report_name($report_title);
 $report_file = $MIGGITDIR . $report_file;
 
@@ -166,7 +164,7 @@ foreach my $t (@report_tags) {
     }
 
     foreach my $fname (@asset_files) {
-        my $asset_path = $mig_path . '../mig-asc/' . $fname;
+        my $asset_path = $mig_path . '../asc/' . $fname;
         open my $a, $asset_path or abort("Could not open $fname.");
         while ( my $l = <$a> ) {
             print $fh $l;
@@ -236,7 +234,7 @@ sub find_xml {
 
     if ($reports_xml =~ m/\//) { return $reports_xml; }
 
-    my $mig_test_file =  $mig_path . '/../mig-xml/' . $reports_xml;
+    my $mig_test_file =  $mig_path . '/../xml/' . $reports_xml;
     my $working_test_dir = getcwd();
     my $working_test_file = $working_test_dir . '/' . $reports_xml;