change mig gsheet --push to use the tab name

diff --git a/mig b/mig
index ea11e6f..94731c5 100755 (executable)
--- a/mig
+++ b/mig
@@ -255,7 +255,7 @@ Holds, Actors, Bibs, Assets & Money.
 
 Allows you to override the default evergreen_staged_report.xml in the mig-xml folder.
 
-=item B<gsheet> --pull spreadsheet_tab or --push postgres_table
+=item B<gsheet> --pull or --push spreadsheet_tab
 
 This uses the gsheet_tracked_table and gsheet_tracked column tables to map a Google Docs Spreadsheet tabs
 with Postgres tables in the mig schema.  The spreadsheet is assumed to share the name as the mig schema. 

diff --git a/mig-bin/mig-gsheet b/mig-bin/mig-gsheet
index 84c3250..a4e089c 100755 (executable)
--- a/mig-bin/mig-gsheet
+++ b/mig-bin/mig-gsheet
@@ -119,22 +119,23 @@ if (defined $cmd_pull) {
 
 if (defined $cmd_push) {
     print "Pushing ";
+    my @tab_names;
     if ($cmd_push eq 'all') {
-        print "all tables.\n";
-        $sql = 'SELECT table_name FROM gsheet_tracked_table;';
+        print "all worksheets.\n";
+        $sql = 'SELECT tab_name FROM gsheet_tracked_table;';
         $sth = $dbh->prepare($sql);
         $ra = $sth->execute();
         while (my @row = $sth->fetchrow_array) {
-            push @table_names, $row[0];
+            push @tab_names, $row[0];
         }
     } else {
-        print "only table $cmd_push.\n";
+        print "only worksheet $cmd_push.\n";
         if (!defined $cmd_push) { abort('command incomplete'); }
-        push @table_names, $cmd_push;
+        push @tab_names, $cmd_push;
     }
-    foreach my $pull_tb (@table_names) {
+    foreach my $push_ws_name (@tab_names) {
+        my $pull_tb = get_table_name($push_ws_name,$dbh);
         my @table_headers = get_pg_column_headers($pull_tb,$MIGSCHEMA);
-        my $push_ws_name = get_worksheet_name($pull_tb,$dbh);
         print "worksheetname: $push_ws_name\n";
         my $push_ws = $spreadsheet->worksheet( {title => $push_ws_name} );
         if (!defined $push_ws) { next; }
@@ -289,21 +290,21 @@ sub get_table_name {
     return $table_name;
 }
 
-sub get_worksheet_name {
-    my $table = shift;
-    my $dbh = shift;
-
-    my $sql = 'SELECT tab_name FROM gsheet_tracked_table WHERE table_name = \'' . $table . '\';';
-    print "$sql \n";
-    my $sth = $dbh->prepare($sql);
-    my $xs = $sth->execute();
-    my $worksheet_name;
-    while (my @row = $sth->fetchrow_array) {
-        $worksheet_name = $row[0];
-    }
-
-    return $worksheet_name;
-}
+#sub get_worksheet_name {
+#    my $table = shift;
+#    my $dbh = shift;
+#
+#    my $sql = 'SELECT tab_name FROM gsheet_tracked_table WHERE table_name = \'' . $table . '\';';
+#    print "$sql \n";
+#    my $sth = $dbh->prepare($sql);
+#    my $xs = $sth->execute();
+#    my $worksheet_name;
+#    while (my @row = $sth->fetchrow_array) {
+#        $worksheet_name = $row[0];
+#    }
+#
+#    return $worksheet_name;
+#}
 
 
 sub check_for_gsheet_tracked_column {