fixed BED BUG

git-svn-id: http://biopieces.googlecode.com/svn/trunk@357 74ccb610-7750-0410-82ae-013aeee3265d

diff --git a/code_perl/Maasha/Biopieces.pm b/code_perl/Maasha/Biopieces.pm
index 4cbf81b8aa34aea6c9c9e944fb556129b62f3131..8260d0979f672b137f89da609339c1c2220cc8e3 100644 (file)
--- a/code_perl/Maasha/Biopieces.pm
+++ b/code_perl/Maasha/Biopieces.pm
@@ -6700,6 +6700,8 @@ sub clean_tmp
             $sid  = $2;
             $pid  = $3;
 
+            next if $user eq "m.hansen";
+
             if ( $user eq Maasha::Common::get_user() )
             {
                 if ( not Maasha::Common::process_running( $pid ) )

diff --git a/code_perl/Maasha/UCSC/BED.pm b/code_perl/Maasha/UCSC/BED.pm
index b259086a565426550a8537c50e3f1aab1bc3fa40..a7a878f8c387cf1371e145cbafdf83fc8c3392cf 100644 (file)
--- a/code_perl/Maasha/UCSC/BED.pm
+++ b/code_perl/Maasha/UCSC/BED.pm
@@ -523,17 +523,24 @@ sub biopiece2bed
          defined $bp_record->{ "THICK_END" } )
     {
         $bed_entry[ thickStart ] = $bp_record->{ "THICK_BEG" };
-        $bed_entry[ thickEnd ]   = $bp_record->{ "THICK_END" };
+        $bed_entry[ thickEnd ]   = $bp_record->{ "THICK_END" } + 1;
     }
-    else
+    elsif ( defined $bp_record->{ "BLOCK_COUNT" } )
     {
         $bed_entry[ thickStart ] = $bed_entry[ chromStart ];
-        $bed_entry[ thickEnd ]   = $bed_entry[ chromEnd ] - 1;
+        $bed_entry[ thickEnd ]   = $bed_entry[ chromEnd ];
     }
 
     return wantarray ? @bed_entry : \@bed_entry if $cols == 8;
 
-    $bed_entry[ itemRgb ] = $bp_record->{ "COLOR" } || 0;
+    if ( defined $bp_record->{ "COLOR" } )
+    {
+        $bed_entry[ itemRgb ] = $bp_record->{ "COLOR" };
+    }
+    elsif ( defined $bp_record->{ "BLOCK_COUNT" } )
+    {
+        $bed_entry[ itemRgb ] = 0;
+    }
 
     return wantarray ? @bed_entry : \@bed_entry if $cols == 9;
 
@@ -547,7 +554,7 @@ sub biopiece2bed
         $bed_entry[ blockCount ]  = $bp_record->{ "BLOCK_COUNT" };
         $bed_entry[ blockSizes ]  = $bp_record->{ "BLOCK_LENS" };
         $bed_entry[ blockStarts ] = join ",", @begs;
-        $bed_entry[ thickEnd ]++;
+        $bed_entry[ thickEnd ];
     }
     elsif ( defined $bp_record->{ "BLOCK_COUNT" } and
          defined $bp_record->{ "BLOCK_LENS" }  and
@@ -556,7 +563,7 @@ sub biopiece2bed
         $bed_entry[ blockCount ]  = $bp_record->{ "BLOCK_COUNT" };
         $bed_entry[ blockSizes ]  = $bp_record->{ "BLOCK_LENS" };
         $bed_entry[ blockStarts ] = $bp_record->{ "Q_BEGS" };
-        $bed_entry[ thickEnd ]++;
+        $bed_entry[ thickEnd ];
     }
 
     return wantarray ? @bed_entry : \@bed_entry;