X-Git-Url: http://git.equinoxoli.org/?p=migration-tools.git;a=blobdiff_plain;f=mig-bin%2Fmig-reporter;h=21fa1170f6631fe7f2fb114e2f24720f351c9d94;hp=2dc23b94cc4c947d7e97472f097a538681a3f2c0;hb=337680650a86c2fb1c5d5bddfb4053a56fb9964b;hpb=9e1dd47deb11013ec5dbf77ba9757075d5b74aac

diff --git a/mig-bin/mig-reporter b/mig-bin/mig-reporter
index 2dc23b9..21fa117 100755
--- a/mig-bin/mig-reporter
+++ b/mig-bin/mig-reporter
@@ -100,13 +100,15 @@ 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);
 
 if (defined $added_page_file or defined $added_page_title) {
     abort('must specify --added_page_file and --added_page_title') unless defined $added_page_file and defined $added_page_title;
     }
+if (defined $added_page_file) { $added_page_file = $MIGGITDIR . $added_page_file; }
 if ($MIGSCHEMA eq 'full') { $MIGSCHEMA = ''; }
 
 my $dbh = Mig::db_connect();
@@ -144,8 +146,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";
@@ -263,11 +264,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 . '\');';
@@ -290,7 +291,7 @@ sub print_query {
     my $fh = shift;
     my %report = @_;
     my $query = $report{query};
-    $query =~ s/mig_schema/$MIGSCHEMA/g;
+    $query =~ s/MIGSCHEMA/$MIGSCHEMA/g;
     $query =~ s/mig_func_schema/$mig_func_schema/g;
     my $sth = $dbh->prepare($query);
     $sth->execute();