X-Git-Url: http://git.equinoxoli.org/?p=migration-tools.git;a=blobdiff_plain;f=mig-bin%2Fmig-reporter;h=89140050126b20e8f238691649826450ca17bf07;hp=d97d4f0a35e5d2121646c3034bd620d6dc48b4f9;hb=ed724b63f7d32cf5bb1a6e7b4c915d056413e899;hpb=26face520a28beb3c5cf6bc71b17f70f2442593b

diff --git a/mig-bin/mig-reporter b/mig-bin/mig-reporter
index d97d4f0..8914005 100755
--- a/mig-bin/mig-reporter
+++ b/mig-bin/mig-reporter
@@ -94,7 +94,7 @@ 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'); }
 
@@ -109,12 +109,10 @@ 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;
-my $mig_func_schema = $MIGSCHEMA;
 
 open(my $fh, '>', $report_file) or die "Could not open output file!";
 
@@ -136,8 +134,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 ... ";
@@ -146,8 +142,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";
@@ -167,6 +162,7 @@ foreach my $t (@report_tags) {
     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;
@@ -187,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;
@@ -265,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 . '\');';
@@ -292,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\n";
     my $sth = $dbh->prepare($query);
     $sth->execute();