X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=bp_bin%2Fsum_vals;h=e20f178d504f4c65cf772a4283ea7a16b83978c8;hb=c401b3387e7713ee622638150609f11ee9305928;hp=2a69acda842780d6041bb7dd1b734cc2e3458945;hpb=b7e4315becedf4cf650f131aa711abfa21a07525;p=biopieces.git

diff --git a/bp_bin/sum_vals b/bp_bin/sum_vals
index 2a69acd..e20f178 100755
--- a/bp_bin/sum_vals
+++ b/bp_bin/sum_vals
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl -w
+#!/usr/bin/env perl
 
 # Copyright (C) 2007-2009 Martin A. Hansen.
 
@@ -26,23 +26,29 @@
 # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 
 
+use warnings;
 use strict;
 use Maasha::Biopieces;
+use Maasha::Calc;
 
 
 # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 
 
-my ( $run_time_beg, $run_time_end, $options, $in, $out, $record, $key, %sum_hash, $fh );
+my ( $options, $in, $out, $record, $new_record, $key, %sum_hash, $fh );
 
 $options = Maasha::Biopieces::parse_options(
     [
-        { long => 'no_stream', short => 'x', type => 'flag', mandatory => 'no',  default => undef, allowed => undef, disallowed => undef },
-        { long => 'data_out',  short => 'o', type => 'file', mandatory => 'no',  default => undef, allowed => undef, disallowed => undef },
-        { long => 'keys',      short => 'k', type => 'list', mandatory => 'yes', default => undef, allowed => undef, disallowed => undef },
+        { long => 'no_stream', short => 'x', type => 'flag',   mandatory => 'no', default => undef, allowed => undef, disallowed => undef },
+        { long => 'data_out',  short => 'o', type => 'file',   mandatory => 'no', default => undef, allowed => undef, disallowed => undef },
+        { long => 'keys',      short => 'k', type => 'list',   mandatory => 'no', default => undef, allowed => undef, disallowed => undef },
+        { long => 'list',      short => 'l', type => 'string', mandatory => 'no', default => undef, allowed => undef, disallowed => undef },
     ]   
 );
 
+Maasha::Common::error( qq(both --keys and --list specified) ) if     $options->{ "keys" } and     $options->{ "list" };
+Maasha::Common::error( qq(no --keys or --list specified) )    if not $options->{ "keys" } and not $options->{ "list" };
+
 $in  = Maasha::Biopieces::read_stream( $options->{ "stream_in" } );
 $out = Maasha::Biopieces::write_stream( $options->{ "stream_out" } );
 
@@ -55,13 +61,27 @@ while ( $record = Maasha::Biopieces::get_record( $in ) )
         }
     }
 
+    if ( $options->{ 'list' } and $record->{ $options->{ 'list' } } ) {
+        $record->{ $options->{ 'list' } . "_SUM" } = sprintf( "%.2f", Maasha::Calc::sum( [ split ";", $record->{ $options->{ 'list' } } ] ) );
+    }
+
     Maasha::Biopieces::put_record( $record, $out ) if not $options->{ "no_stream" };
 }
 
+Maasha::Biopieces::close_stream( $in );
+Maasha::Biopieces::close_stream( $out );
+
 $fh = Maasha::Biopieces::write_stream( $options->{ "data_out" } );
 
 foreach $key ( @{ $options->{ "keys" } } ) {
-    Maasha::Biopieces::put_record( { $key . "_SUM" => $sum_hash{ $key } || 0 } , $fh );
+    $new_record->{ $key . "_SUM" } = $sum_hash{ $key } || 0;
+}
+
+if ( $options->{ "keys" } and $new_record )
+{
+    $new_record->{ 'REC_TYPE' } = "SUM";
+
+    Maasha::Biopieces::put_record( $new_record, $fh );
 }
 
 close $fh;
@@ -72,20 +92,13 @@ close $fh;
 
 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();
 }
 
 
@@ -93,4 +106,3 @@ END
 
 
 __END__
-