X-Git-Url: http://git.equinoxoli.org/?p=migration-tools.git;a=blobdiff_plain;f=mig-bin%2Fmig-reporter;h=adeefe2d25cb0daf4e68ca7d29d540929dc4cc32;hp=cb7e4e6153a79f26dd3011ea6c2c8791c3d6043a;hb=11896d6209f169cbabe9fb6cfc944695b47a1425;hpb=91f3fc3c89d088788f7064bc06764ff83a40e607

diff --git a/mig-bin/mig-reporter b/mig-bin/mig-reporter
index cb7e4e6..adeefe2 100755
--- a/mig-bin/mig-reporter
+++ b/mig-bin/mig-reporter
@@ -109,13 +109,12 @@ 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();
 my $report_file = create_report_name($report_title);
 $report_file = $MIGGITDIR . $report_file;
 
-open(my $fh, '>', $report_file) or die "Could not open output file!";
+open(my $fh, '>', $report_file) or abort("Could not open output file!");
 
 write_title_page($report_title,$fh,$analyst);
 
@@ -123,7 +122,7 @@ if (defined $added_page_file and defined $added_page_title) {
     print $fh "<<<\n";
     print $fh "== $added_page_title\n";
     print "$added_page_file\t$added_page_title\n";
-    open(my $an,'<:encoding(UTF-8)', $added_page_file) or die "Could not open $added_page_file !";
+    open(my $an,'<:encoding(UTF-8)', $added_page_file) or abort("Could not open $added_page_file!");
     while ( my $line = <$an> ) {
         print $fh $line;
     }
@@ -148,21 +147,43 @@ my @report_tags = split(/\./,$tags);
 foreach my $t (@report_tags) {
     print "\n\n=========== Starting to process tag $t\n";
     print   "==========================================\n";
+
+    my @asset_files;
+    foreach my $asset ($dom->findnodes('//asset')) {
+        if (index($asset->findvalue('./tag'),$t) != -1) {
+            push @asset_files, $asset->findvalue('./file');
+        }
+    }
+
+    foreach my $fname (@asset_files) {
+        my $asset_path = $mig_path . '../mig-asc/' . $fname;
+        open my $a, $asset_path or abort("Could not open $fname.");
+        while ( my $l = <$a> ) {
+            print $fh $l;
+        }
+    print $fh "<<<\n";
+    }
+
     print_section_header(ucfirst($t),$fh);
     my $linecount = $lines_per_page;
     my $r;
 
-    my @report_names;
+    my @asset_files;
+    foreach my $asset ($dom->findnodes('//asset')) {
+        if (index($asset->findvalue('./tag'),$t) != -1) {
+            push @asset_files, $asset->findvalue('./file');
+        }
+    }
 
+    my @report_names;
     foreach my $report ($dom->findnodes('//report')) {
         if (index($report->findvalue('./tag'),$t) != -1 and $report->findvalue('./iteration') eq '0') {
             push @report_names, $report->findvalue('./name');
         }
     }
-    
-    print Dumper(@report_names);
 
     #only has one level of failover now but could change to array of hashes and loops
+    #but this keeps it simple and in practice I haven't needed more than two
     foreach my $rname (@report_names) {
         my %report0;
         my %report1;
@@ -199,7 +220,7 @@ sub find_report {
     print "iteration $iteration ";
     foreach my $node ($dom->findnodes('//report')) {
         if ($node->findvalue('./tag') =~ $tag and $node->findvalue('./iteration') eq $iteration and $node->findvalue('./name') eq $name) {
-            print "succeeded ... ";
+            print "succeeded ... \n";
             %report = (
                 name => $node->findvalue('./name'),
                 report_title => $node->findvalue('./report_title'),
@@ -212,7 +233,7 @@ sub find_report {
             return %report;
         }
     }
-    print "failed ... ";
+    print "failed ... \n";
     return %report = (
         name => "eaten by grue"
     );
@@ -259,17 +280,38 @@ sub check_table {
     my $query = shift;
     my $MIGSCHEMA = shift;
 
-    my $i = 0;
+    my $i;
     my $return_flag = 1;   
     my @qe = split(/ /,$query);
-    my @tables = grep /MIGSCHEMA/, @qe;
-
+    $i = @qe;
+    $i--;
+    my @tables;
+    while ($i > -1) {
+        if ($qe[$i] eq 'FROM' or $qe[$i] eq 'JOIN') {
+            my $q = $i + 1;
+            if ($qe[$q] ne '(SELECT') {
+                push @tables, $qe[$q];            
+            }
+        }
+        $i--;
+    }
     print "checking tables ... ";
+
+    $i = 0;
     foreach my $table (@tables) {
-        $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 . '\');';
+        my $sql;
+        my $schema;
+        if (index($table,'.') != -1) {
+            $schema = (split /\./,$table)[0];
+            $table = (split /\./,$table)[1];
+        } 
+        if (defined $schema) {
+            $sql = 'SELECT EXISTS (SELECT 1 FROM information_schema.tables WHERE table_schema = \'' . $schema . '\' AND table_name = \'' . $table . '\');';
+        } else {
+            $sql = 'SELECT EXISTS (SELECT 1 FROM information_schema.tables WHERE table_schema = \'' . $MIGSCHEMA . '\' AND table_name = \'' . $table . '\');';
+        }
         my $sth = $dbh->prepare($sql);
         $sth->execute();
         while (my @row = $sth->fetchrow_array) {
@@ -289,7 +331,7 @@ sub print_query {
     my $fh = shift;
     my %report = @_;
     my $query = $report{query};
-    print $query;
+    print "$query\n";
     my $sth = $dbh->prepare($query);
     $sth->execute();