BGB cleanup of index.cgi

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

diff --git a/www/index.cgi b/www/index.cgi
index fb04e322a2da8233c588735094ab614ff2f39575..0e01a25f4b7e9e4c0c91d37e371e6aa31a1d6e89 100755 (executable)
--- a/www/index.cgi
+++ b/www/index.cgi
@@ -33,7 +33,6 @@ use Maasha::Common;
 use Maasha::Filesys;
 use Maasha::Calc;
 use Maasha::XHTML;
-use Maasha::KISS;
 use Maasha::BGB::Session;
 use Maasha::BGB::Track;
 use Maasha::BGB::Draw;
@@ -123,8 +122,8 @@ sub cookie_default
     $cookie->{ 'ASSEMBLY' }        = $cgi->param( 'assembly' ) || '';
     $cookie->{ 'CONTIG' }          = $cgi->param( 'contig' )   || '';
     $cookie->{ 'Q_ID' }            = $cgi->param( 'q_id' );
-    $cookie->{ 'NAV_START' }     ||= $cgi->param( 'nav_start' ) || $cgi->param( 's_beg' );  # FIXME this is ugly!
-    $cookie->{ 'NAV_END' }       ||= $cgi->param( 'nav_end' )   || $cgi->param( 's_end' );
+    $cookie->{ 'NAV_START' }     ||= $cgi->param( 'nav_start' );
+    $cookie->{ 'NAV_END' }       ||= $cgi->param( 'nav_end' );
     $cookie->{ 'NAV_CENTER' }      = $cgi->param( 'nav_center' );
     $cookie->{ 'S_BEG' }           = $cgi->param( 's_beg' );
     $cookie->{ 'S_END' }           = $cgi->param( 's_end' );
@@ -485,6 +484,10 @@ sub page
 
     my ( @html );
 
+    if ( $cookie->{ 'SESSION_ID' } ) {
+        push @html, Maasha::XHTML::p( txt => Maasha::XHTML::hidden( name => "session_id", value => $cookie->{ 'SESSION_ID' } ) );
+    }
+
     if ( $cookie->{ 'PAGE' } eq 'login' ) {
         push @html, page_login( $cookie );
     } elsif ( $cookie->{ 'PAGE' } eq 'search' ) {
@@ -499,10 +502,6 @@ sub page
         push @html, page_taxonomy( $cookie );
     }
 
-    if ( $cookie->{ 'SESSION_ID' } ) {
-        push @html, Maasha::XHTML::p( txt => Maasha::XHTML::hidden( name => "session_id", value => $cookie->{ 'SESSION_ID' } ) );
-    }
-
     return wantarray ? @html : \@html;
 }
 
@@ -981,8 +980,6 @@ sub section_search
 
         foreach $result ( @{ $results } )
         {
-            $result = Maasha::KISS::kiss2biopiece( $result );
-
             $cookie->{ 'CONTIG' }    = $result->{ 'S_ID' };
             $cookie->{ 'NAV_START' } = $result->{ 'S_BEG' };
             $cookie->{ 'NAV_END' }   = $result->{ 'S_END' };