first cuts of kmig-*iconv

diff --git a/kmig.d/bin/kmig-iconv b/kmig.d/bin/kmig-iconv
index 88acdd0..455e91a 100755 (executable)
--- a/kmig.d/bin/kmig-iconv
+++ b/kmig.d/bin/kmig-iconv
@@ -4,7 +4,7 @@
 
 =head1 NAME
 
-mig-iconv 
+kmig-iconv 
 
 Attempts to invoke B<iconv> on the specified tracked file, placing the
 output in [file].iconv
@@ -25,11 +25,11 @@ iconv [other arguments...] -o <file>.utf8 <file>
 
 =back
 
-You'll need to invoke B<mig-add> prior to using commands like B<mig-iconv>
+You'll need to invoke B<kmig-add> prior to using commands like B<kmig-iconv>
 
 =head1 SYNOPSIS
 
-B<mig-iconv> <file> [other arguments...]
+B<kmig-iconv> <file> [other arguments...]
 
 =cut
 
@@ -38,8 +38,8 @@ B<mig-iconv> <file> [other arguments...]
 use strict;
 use Switch;
 use Env qw(
-    HOME PGHOST PGPORT PGUSER PGDATABASE MIGSCHEMA
-    MIGBASEWORKDIR MIGBASEGITDIR MIGGITDIR MIGWORKDIR
+    HOME MYSQL_HOST MYSQL_TCP_PORT MYSQL_USER MYSQL_DATABASE MYSQL_PW
+    MIGSCHEMA MIGBASEWORKDIR MIGBASEGITDIR MIGGITDIR MIGWORKDIR
 );
 use Pod::Usage;
 use DBI;
@@ -47,12 +47,12 @@ use Cwd 'abs_path';
 use FindBin;
 my $mig_bin = "$FindBin::Bin/";
 use lib "$FindBin::Bin/";
-use Mig;
+use KMig;
 
 pod2usage(-verbose => 2) if ! $ARGV[0] || $ARGV[0] eq '--help';
 
-Mig::die_if_no_env_migschema();
-Mig::die_if_mig_tracking_table_does_not_exist();
+KMig::die_if_no_env_migschema();
+KMig::die_if_mig_tracking_table_does_not_exist();
 
 my $file = abs_path($ARGV[0]);
 if ($file =~ /^$MIGBASEWORKDIR/) {
@@ -69,9 +69,9 @@ sub call_iconv {
     my $file = abs_path(shift);
     my @args = @_;
 
-    my $tracked_file_id = Mig::check_for_tracked_file($file);
+    my $tracked_file_id = KMig::check_for_tracked_file($file);
     if ($tracked_file_id) {
-        my $data = Mig::status_this_file($file);
+        my $data = KMig::status_this_file($file);
         print "iconv'ing tracked file: $file\n";
 
         if (scalar(@args) == 0) {
@@ -87,7 +87,7 @@ sub call_iconv {
         system('iconv', @args, '-o', $file . '.utf8', $file);
         system('touch', $file . '.utf8'); # handle 0-byte files
 
-        my $dbh = Mig::db_connect();
+        my $dbh = KMig::db_connect();
         my $utf8_file = $dbh->quote($file . '.utf8');
         if (! -e $file . '.utf8') {
             print "utf8 file does not exist: $utf8_file\n";
@@ -95,12 +95,12 @@ sub call_iconv {
         }
 
         my $rv = $dbh->do("
-            UPDATE $MIGSCHEMA.tracked_file
+            UPDATE m_tracked_file
             SET utf8_filename = $utf8_file
             WHERE base_filename = " . $dbh->quote($file) . "
             ;
-        ") || die "Error inserting into table $MIGSCHEMA.tracked_file: $!\n";
-        Mig::db_disconnect($dbh);
+        ") || die "Error inserting into table m_tracked_file: $!\n";
+        KMig::db_disconnect($dbh);
     } else {
         print "File not currently tracked: $file\n";
     }

diff --git a/kmig.d/bin/kmig-skip-iconv b/kmig.d/bin/kmig-skip-iconv
index fec558d..c720256 100755 (executable)
--- a/kmig.d/bin/kmig-skip-iconv
+++ b/kmig.d/bin/kmig-skip-iconv
@@ -4,14 +4,14 @@
 
 =head1 NAME
 
-mig-skip-iconv 
+kmig-skip-iconv 
 
 Allows you to either use an existing file named <file>.utf8 or a named
 [utf8 file] as if it were the one created by mig-iconv
 
 =head1 SYNOPSIS
 
-B<mig-skip-iconv> <file> [utf8 file]
+B<kmig-skip-iconv> <file> [utf8 file]
 
 =cut
 
@@ -20,8 +20,8 @@ B<mig-skip-iconv> <file> [utf8 file]
 use strict;
 use Switch;
 use Env qw(
-    HOME PGHOST PGPORT PGUSER PGDATABASE MIGSCHEMA
-    MIGBASEWORKDIR MIGBASEGITDIR MIGGITDIR MIGWORKDIR
+    HOME MYSQL_HOST MYSQL_TCP_PORT MYSQL_USER MYSQL_DATABASE MYSQL_PW
+    MIGSCHEMA MIGBASEWORKDIR MIGBASEGITDIR MIGGITDIR MIGWORKDIR
 );
 use Pod::Usage;
 use DBI;
@@ -29,12 +29,12 @@ use Cwd 'abs_path';
 use FindBin;
 my $mig_bin = "$FindBin::Bin/";
 use lib "$FindBin::Bin/";
-use Mig;
+use KMig;
 
 pod2usage(-verbose => 2) if ! ($ARGV[0]||$ARGV[1]) || $ARGV[0] eq '--help';
 
-Mig::die_if_no_env_migschema();
-Mig::die_if_mig_tracking_table_does_not_exist();
+KMig::die_if_no_env_migschema();
+KMig::die_if_mig_tracking_table_does_not_exist();
 
 my $file = abs_path($ARGV[0]);
 my $utf8_file;
@@ -61,12 +61,12 @@ sub skip_iconv {
     my $file = shift;
     my $utf8_file = shift;
 
-    my $tracked_file_id = Mig::check_for_tracked_file($file);
+    my $tracked_file_id = KMig::check_for_tracked_file($file);
     if ($tracked_file_id) {
-        my $data = Mig::status_this_file($file);
+        my $data = KMig::status_this_file($file);
         print "skipping the iconv'ing of tracked file: $file\n";
 
-        my $dbh = Mig::db_connect();
+        my $dbh = KMig::db_connect();
         if (! $utf8_file) {
             $utf8_file = $file . '.utf8';
         }
@@ -75,12 +75,12 @@ sub skip_iconv {
         }
 
         my $rv = $dbh->do("
-            UPDATE $MIGSCHEMA.tracked_file
+            UPDATE m_tracked_file
             SET utf8_filename = " . $dbh->quote($utf8_file) . "
             WHERE base_filename = " . $dbh->quote($file) . "
             ;
-        ") || die "Error inserting into table $MIGSCHEMA.tracked_file: $!\n";
-        Mig::db_disconnect($dbh);
+        ") || die "Error inserting into table m_tracked_file: $!\n";
+        KMig::db_disconnect($dbh);
     } else {
         print "File not currently tracked: $file\n";
     }