fixes and stuff

[biopieces.git] / code_perl / Maasha / Common.pm

diff --git a/code_perl/Maasha/Common.pm b/code_perl/Maasha/Common.pm
index 9fc7eabd3348bfe614229a88904602c2b23a7d20..9f4170c01dd6d2769159d6f86b5c40edea69d769 100644 (file)
--- a/code_perl/Maasha/Common.pm
+++ b/code_perl/Maasha/Common.pm
@@ -594,6 +594,10 @@ sub time_stamp_diff
     $min0  = $5;
     $sec0  = $6;
 
+    $sec0 += $day0 * 24 * 60 * 60;
+    $sec0 += $hour0 * 60 * 60;;
+    $sec0 += $min0  * 60;
+
     $t1 =~ /(\d+)-(\d+)-(\d+) (\d+):(\d+):(\d+)/;
     $year1 = $1;
     $mon1  = $2;
@@ -602,14 +606,22 @@ sub time_stamp_diff
     $min1  = $5;
     $sec1  = $6;
 
+    $sec1 += $day1 * 24 * 60 * 60;
+    $sec1 += $hour1 * 60 * 60;;
+    $sec1 += $min1  * 60;
+
     $year = $year1 - $year0;
     $mon  = $mon1  - $mon0;
     $day  = $day1  - $day0; 
-    $hour = $hour1 - $hour0;
-    $min  = $min1  - $min0;
-    $sec  = $sec1  - $sec0;
 
-    #return "$year-$mon-$day $hour:$min:$sec";
+    $sec  = $sec1 - $sec0;
+
+    $hour = int( $sec / ( 60 * 60 ) );
+    $sec -= $hour * 60 * 60;
+
+    $min  = int( $sec / 60 );
+    $sec -= $min * 60;
+
     return join( ":", sprintf( "%02d", $hour ), sprintf( "%02d", $min ), sprintf( "%02d", $sec ) );
 }