X-Git-Url: http://git.equinoxoli.org/?p=migration-tools.git;a=blobdiff_plain;f=mig-bin%2Fmig-reporter;h=cb7e4e6153a79f26dd3011ea6c2c8791c3d6043a;hp=d4c0217212272558530a782e9e02c4bd801e6240;hb=5fccd5b580c58cbb300daf3a1d3f4aa6e10afc68;hpb=e1ec5cbdfcaa209535943d47136df6321b2e31ea

diff --git a/mig-bin/mig-reporter b/mig-bin/mig-reporter
index d4c0217..cb7e4e6 100755
--- a/mig-bin/mig-reporter
+++ b/mig-bin/mig-reporter
@@ -94,13 +94,14 @@ foreach my $arg (@ARGV) {
     }
 }
 
-if (!defined $tags) {$tags = 'Circs.Holds.Actors.Bibs.Assets.Money'};
+if (!defined $tags) {$tags = 'circs.holds.actors.bibs.assets.money'};
 if (!defined $analyst) { abort('--analyst must be supplied'); }
 if (!defined $report_title) { abort('--report_title must be supplied'); }
 
 my $mig_path = abs_path($0);
 $mig_path =~ s|[^/]+$||;
-if (!defined $reports_xml) { $reports_xml = $mig_path . '../mig-xml/evergreen_staged_report.xml'; }
+if (!defined $reports_xml) { $reports_xml = $mig_path . '../mig-xml/evergreen_staged_report.xml'; } 
+    else { $reports_xml = $mig_path . '/../mig-xml/' . $reports_xml; }
 print "$reports_xml \n";
 my $dom = $parser->parse_file($reports_xml);
 
@@ -113,7 +114,6 @@ if ($MIGSCHEMA eq 'full') { $MIGSCHEMA = ''; }
 my $dbh = Mig::db_connect();
 my $report_file = create_report_name($report_title);
 $report_file = $MIGGITDIR . $report_file;
-my $mig_func_schema = $MIGSCHEMA;
 
 open(my $fh, '>', $report_file) or die "Could not open output file!";
 
@@ -135,8 +135,6 @@ foreach my $func ($dom->findnodes('//function')) {
     my $fdrop = $func->findvalue('./drop');
     my $fcreate = $func->findvalue('./create');    
     my $fname = $func->findvalue('./name');
-    $fdrop =~ s/mig_func_schema/$mig_func_schema/g;
-    $fcreate =~ s/mig_func_schema/$mig_func_schema/g;
     my $sdrop = $dbh->prepare($fdrop);
     my $screate = $dbh->prepare($fcreate);
     print "dropping function $fname ... ";
@@ -145,8 +143,7 @@ foreach my $func ($dom->findnodes('//function')) {
     $screate->execute();
 }
 
-
-
+$tags = lc($tags);
 my @report_tags = split(/\./,$tags);
 foreach my $t (@report_tags) {
     print "\n\n=========== Starting to process tag $t\n";
@@ -186,11 +183,12 @@ foreach my $t (@report_tags) {
         }
     }
 }
-# end of main logic
 
 print "\n";
 close $fh;
 
+############ end of main logic
+
 sub find_report {
     my $dom = shift;
     my $tag = shift;
@@ -264,11 +262,11 @@ sub check_table {
     my $i = 0;
     my $return_flag = 1;   
     my @qe = split(/ /,$query);
-    my @tables = grep /mig_schema/, @qe;
+    my @tables = grep /MIGSCHEMA/, @qe;
 
     print "checking tables ... ";
     foreach my $table (@tables) {
-        $table =~ s/mig_schema.//g;
+        $table =~ s/MIGSCHEMA.//g;
         $table =~ s/\)//g;
         $table =~ s/\<//g;
         my $sql = 'SELECT EXISTS (SELECT 1 FROM information_schema.tables WHERE table_schema = \'' . $MIGSCHEMA . '\' AND table_name = \'' . $table . '\');';
@@ -291,8 +289,7 @@ sub print_query {
     my $fh = shift;
     my %report = @_;
     my $query = $report{query};
-    $query =~ s/mig_schema/$MIGSCHEMA/g;
-    $query =~ s/mig_func_schema/$mig_func_schema/g;
+    print $query;
     my $sth = $dbh->prepare($query);
     $sth->execute();