big fixes from rkulagow in irc

Author: ex-nerd

trunk/export/NUV_SQL.pm

@@ -57,7 +57,7 @@ package export::NUV_SQL;
              ."This will extract it from the MythTV database into .nuv and .sql \n"
              ."files to import into another MythTV installation.\n\n";
     # Make sure the user knows what he/she is doing
-        $self->{'delete'} = query_text("Do you want to removed it from this server when finished?",
+        $self->{'delete'} = query_text("Do you want to remove it from this server when finished?",
                                        'yesno',
                                        $self->{'delete'} ? 'Yes' : 'No');
     # Make EXTRA sure
@@ -82,6 +82,9 @@ package export::NUV_SQL;
             $self->{'export_path'} = $self->get_outfile($episode, '');
             mkdir($self->{'export_path'}, 0755) or die "Can't create $self->{'export_path'}:  $!\n\n";
         }
+        else {
+            $self->{'export_path'} = $self->{'path'};
+        }
     # Load the three files we'll be using
         my $txt_file = basename($episode->{'filename'}, '.nuv') . '.txt';
         my $sql_file = basename($episode->{'filename'}, '.nuv') . '.sql';

trunk/mythtv/nuvinfo.pm

@@ -165,7 +165,7 @@ package mythtv::nuvinfo;
 # Uses one of two mpeg info programs to load data about mpeg-based nuv files
     sub mpeg_info {
         my $file = shift;
-        $file =~ s/'/\\'/sg;
+        $file =~ s/'/'\\''/sg;
         my %info;
     # First, we check for the existence of  an mpeg info program
         my $program = find_program('mplayer');

trunk/nuvexport

@@ -5,7 +5,7 @@
 # $Author$
 
 # Version
-    $VERSION = '0.3 0.20060306.svn';
+    $VERSION = '0.3 0.20060312.svn';
 
 # Autoflush buffers
     $|++;

trunk/nuvexport.spec

@@ -4,7 +4,7 @@
 
 Name:       nuvexport
 Version:    0.3
-Release:    0.20060306.svn
+Release:    0.20060312.svn
 License:    GPL
 Summary:    mythtv nuv video file conversion script
 URL:        http://forevermore.net/nuvexport/