X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=bp_bin%2Fcreate_vmatch_index;h=b5d4d0e97d213a1ca2544ed378c7c1b1cc9fcd07;hb=2f0fd91b461033529a4a72e161bd133252a22eb6;hp=e6dc983a804cf0f9c0b2447177f617af57044773;hpb=b607bb9d6e4adcebd9f9e128aacc91a212010ee0;p=biopieces.git

diff --git a/bp_bin/create_vmatch_index b/bp_bin/create_vmatch_index
index e6dc983..b5d4d0e 100755
--- a/bp_bin/create_vmatch_index
+++ b/bp_bin/create_vmatch_index
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl -w
+#!/usr/bin/env perl
 
 # Copyright (C) 2007-2009 Martin A. Hansen.
 
@@ -26,6 +26,7 @@
 # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 
 
+use warnings;
 use strict;
 use Maasha::Common;
 use Maasha::Biopieces;
@@ -37,20 +38,20 @@ use Maasha::Fasta;
 # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 
 
-my ( $default, $formats, $options, $in, $out, $record, $file_tmp, $fh_tmp, $type, $entry );
+my ( $default, $formats, $options, $in, $out, $record, $tmp_dir, $file_tmp, $fh_tmp, $type, $entry );
 
 $options = Maasha::Biopieces::parse_options(
     [
         { long => 'no_stream',     short => 'x', type => 'flag',   mandatory => 'no',  default => undef, allowed => undef, disallowed => undef },
         { long => 'index_name',    short => 'i', type => 'string', mandatory => 'yes', default => undef, allowed => undef, disallowed => undef },
-        { long => 'prefix_length', short => 'p', type => 'uint',   mandatory => 'no',  default => undef, allowed => undef, disallowed => 0 },
     ]   
 );
 
 $in  = Maasha::Biopieces::read_stream( $options->{ "stream_in" } );
 $out = Maasha::Biopieces::write_stream( $options->{ "stream_out" } );
 
-$file_tmp = $options->{ 'index_name' };
+$tmp_dir  = Maasha::Biopieces::get_tmpdir();
+$file_tmp = "$tmp_dir/create_vmatch_index.seq";
 $fh_tmp   = Maasha::Filesys::file_write_open( $file_tmp );
 
 while ( $record = Maasha::Biopieces::get_record( $in ) ) 
@@ -67,13 +68,17 @@ while ( $record = Maasha::Biopieces::get_record( $in ) )
 
 close $fh_tmp;
 
-if ( $type eq "protein" ) {
-    Maasha::Common::run( "mkvtree", "-db $file_tmp -protein -pl $options->{ 'prefix_length' } -allout -indexname $file_tmp > /dev/null 2>&1" );
+if ( $options->{ 'verbose' } ) {
+    Maasha::Common::run( "mkvtree", "-db $file_tmp -" . ( lc $type ) . " -pl -allout -indexname $options->{ 'index_name' }" );
 } else {
-    Maasha::Common::run( "mkvtree", "-db $file_tmp -dna -pl $options->{ 'prefix_length' } -allout -indexname $file_tmp > /dev/null 2>&1" );
+    Maasha::Common::run( "mkvtree", "-db $file_tmp -" . ( lc $type ) . " -pl -allout -indexname $options->{ 'index_name' } > /dev/null 2>&1" );
 }
 
 unlink $file_tmp;
+Maasha::Filesys::dir_remove( $tmp_dir );
+
+Maasha::Biopieces::close_stream( $in );
+Maasha::Biopieces::close_stream( $out );
 
 
 # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
@@ -81,19 +86,13 @@ unlink $file_tmp;
 
 BEGIN
 {
-    $run_time_beg = Maasha::Biopieces::run_time();
-
-    Maasha::Biopieces::log_biopiece();
+    Maasha::Biopieces::status_set();
 }
 
+
 END
 {
-    Maasha::Biopieces::close_stream( $in );
-    Maasha::Biopieces::close_stream( $out );
-
-    $run_time_end = Maasha::Biopieces::run_time();
-
-    Maasha::Biopieces::run_time_print( $run_time_beg, $run_time_end, $options );
+    Maasha::Biopieces::status_log();
 }
 
 
@@ -101,5 +100,3 @@ END
 
 
 __END__
-
-