[Bio] / FigWebServices / protein.cgi Repository:
ViewVC logotype

Diff of /FigWebServices/protein.cgi

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.205, Wed Jun 21 23:59:48 2006 UTC revision 1.206, Tue Jun 27 17:21:04 2006 UTC
# Line 78  Line 78 
78      exit;      exit;
79  }  }
80    
81    if ($cgi->param('new_framework'))
82    {
83        $ENV{'METHOD'} = 'GET';
84    #    $ENV{'QUERY_STRING'} = join("&","new_framework=1",
85    #                                   map { my $k = $_; my $v = $cgi->param($k); "$k=$v" } $cgi->@param);
86        $ENV{'QUERY_STRING'} .= "&new_framwork=1";
87        my @out = `./frame.cgi`;
88        print @out;
89        exit;
90    }
91    
92    
93  my($fig_or_sprout);  my($fig_or_sprout);
94    
95  my $is_sprout;  my $is_sprout;
# Line 737  Line 749 
749          my @coup = $fig_or_sprout->abstract_coupled_to($peg);          my @coup = $fig_or_sprout->abstract_coupled_to($peg);
750          if (@coup > 0)          if (@coup > 0)
751          {          {
752              my $link = &cgi_url . "/protein.cgi?prot=$peg&user=$user&request=abstract_coupling\n";              my $new_framework = $cgi->param('new_framework');
753                $new_framework = $new_framework ? 1 : 0;
754                my $link = &cgi_url . "/protein.cgi?prot=$peg&user=$user&request=abstract_coupling&new_framework\n";
755              push(@$html,"<br><a href=$link>Show Abstract Coupling Data</a>\n");              push(@$html,"<br><a href=$link>Show Abstract Coupling Data</a>\n");
756          }          }
757      }      }
# Line 928  Line 942 
942    
943          #push @$tab, [[$cgi->submit('Edit Attributes'), "td colspan=2 style=\"text-align: center\""]];          #push @$tab, [[$cgi->submit('Edit Attributes'), "td colspan=2 style=\"text-align: center\""]];
944      }      }
945      push(@$html,$cgi->start_form(-action=>"protein.cgi"), $cgi->hidden("prot"), $cgi->hidden("user"));      push(@$html,$cgi->start_form(-action=>"protein.cgi"), $cgi->hidden("prot"), $cgi->hidden("user"),$cgi->hidden('new_framework'));
946      if (($cgi->param('user') && $cgi->param('Edit Attributes')) || $cgi->param("showtag")) {      if (($cgi->param('user') && $cgi->param('Edit Attributes')) || $cgi->param("showtag")) {
947          # these are the cases where we automatically want this shown          # these are the cases where we automatically want this shown
948          push(@$html,$cgi->br,$cgi->hr,&HTML::make_table($col_hdrs, $tab,"Attributes"),$cgi->hr);          push(@$html,$cgi->br,$cgi->hr,&HTML::make_table($col_hdrs, $tab,"Attributes"),$cgi->hr);
# Line 1836  Line 1850 
1850      my $chk_sort_by_bits  = select_if( $sort_by eq 'bits' );      my $chk_sort_by_bits  = select_if( $sort_by eq 'bits' );
1851      my $chk_sort_by_bpp   = select_if( $sort_by eq 'bpp' );      my $chk_sort_by_bpp   = select_if( $sort_by eq 'bpp' );
1852      my $chk_sort_by_bpp2  = select_if( $sort_by eq 'bpp2' );      my $chk_sort_by_bpp2  = select_if( $sort_by eq 'bpp2' );
1853        my $new_framework = $cgi->param('new_framework');
1854        $new_framework = $new_framework ? 1 : 0;
1855    
1856      #  Features unique to the long form:      #  Features unique to the long form:
1857    
# Line 1852  Line 1868 
1868      <input type=hidden name=fid       value=\"$peg\">      <input type=hidden name=fid       value=\"$peg\">
1869      <input type=hidden name=user      value=\"$user\">      <input type=hidden name=user      value=\"$user\">
1870      <input type=hidden name=translate value=$trans_role>      <input type=hidden name=translate value=$trans_role>
1871        <input type=hidden name=new_framework value=\"$new_framework\">
1872    
1873      &nbsp;&nbsp;&nbsp; Max sims:<input type=text name=maxN size=5 value=$maxN> &nbsp;&nbsp;      &nbsp;&nbsp;&nbsp; Max sims:<input type=text name=maxN size=5 value=$maxN> &nbsp;&nbsp;
1874      Max expand:<input type=text name=max_expand size=5 value=$max_expand> &nbsp;&nbsp;      Max expand:<input type=text name=max_expand size=5 value=$max_expand> &nbsp;&nbsp;
# Line 1927  Line 1944 
1944      <input type=hidden name=fid       value=\"$peg\">      <input type=hidden name=fid       value=\"$peg\">
1945      <input type=hidden name=user      value=\"$user\">      <input type=hidden name=user      value=\"$user\">
1946      <input type=hidden name=translate value=$trans_role>      <input type=hidden name=translate value=$trans_role>
1947        <input type=hidden name=new_framework value=\"$new_framework\">
1948    
1949      Max sims:<input type=text name=maxN size=5 value=$maxN> &nbsp;&nbsp;      Max sims:<input type=text name=maxN size=5 value=$maxN> &nbsp;&nbsp;
1950      Max expand:<input type=text name=max_expand size=5 value=$max_expand> &nbsp;&nbsp;      Max expand:<input type=text name=max_expand size=5 value=$max_expand> &nbsp;&nbsp;
# Line 2687  Line 2705 
2705  sub add_previous_next {  sub add_previous_next {
2706      my($html,$prev,$next,$fig_or_sprout,$peg,$user,$sz_region,$num_close) = @_;      my($html,$prev,$next,$fig_or_sprout,$peg,$user,$sz_region,$num_close) = @_;
2707    
2708        my $new_framework = $cgi->param('new_framework');
2709        $new_framework = $new_framework ? 1 : 0;
2710    
2711      push(@$html,$cgi->br);      push(@$html,$cgi->br);
2712      if ($prev)      if ($prev)
2713      {      {
2714          push(@$html,"<a href=protein.cgi?prot=$prev&compare_region=1&user=$user&sz_region=$sz_region&num_close=$num_close>previous</a>");          push(@$html,"<a href=protein.cgi?prot=$prev&compare_region=1&user=$user&sz_region=$sz_region&num_close=$num_close&new_framework=$new_framework>previous</a>");
2715      }      }
2716      else      else
2717      {      {
# Line 2713  Line 2734 
2734              if (@genes > 0)              if (@genes > 0)
2735              {              {
2736                  my $gene = $genes[0];                  my $gene = $genes[0];
2737                  push(@$html,"<a href=protein.cgi?prot=$gene&compare_region=1&user=$user&sz_region=$sz_region&num_close=$num_close>previous</a>");                  push(@$html,"<a href=protein.cgi?prot=$gene&compare_region=1&user=$user&sz_region=$sz_region&num_close=$num_close&new_framework=$new_framework>previous</a>");
2738              }              }
2739          }          }
2740      }      }
# Line 2721  Line 2742 
2742    
2743      if ($next)      if ($next)
2744      {      {
2745          push(@$html,"&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <a href=protein.cgi?prot=$next&compare_region=1&user=$user&sz_region=$sz_region&num_close=$num_close>next</a>");          push(@$html,"&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <a href=protein.cgi?prot=$next&compare_region=1&user=$user&sz_region=$sz_region&num_close=$num_close&new_framework=$new_framework>next</a>");
2746      }      }
2747      else      else
2748      {      {
# Line 2744  Line 2765 
2765              if (@genes > 0)              if (@genes > 0)
2766              {              {
2767                  my $gene = $genes[0];                  my $gene = $genes[0];
2768                  push(@$html,"&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <a href=protein.cgi?prot=$gene&compare_region=1&user=$user&sz_region=$sz_region&num_close=$num_close>next</a>");                  push(@$html,"&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <a href=protein.cgi?prot=$gene&compare_region=1&user=$user&sz_region=$sz_region&num_close=$num_close&new_framework=$new_framework>next</a>");
2769              }              }
2770          }          }
2771      }      }
# Line 2825  Line 2846 
2846                                 );                                 );
2847    
2848                  my $sprout = $cgi->param('SPROUT') ? 1 : "";                  my $sprout = $cgi->param('SPROUT') ? 1 : "";
2849                    my $new_framework = $cgi->param('new_framework');
2850                    $new_framework = $new_framework ? 1 : 0;
2851    
2852                  my $fmg;                  my $fmg;
2853                  if ($sprout)                  if ($sprout)
2854                  {                  {
2855                      $fmg = "<a href=\&quot;protein.cgi?SPROUT=$sprout&compare_region=1\&num_close=".$cgi->param('num_close'). "\&prot=$fid\&user=$user\&quot>show</a>";                      $fmg = "<a href=\&quot;protein.cgi?SPROUT=$sprout&compare_region=1\&num_close=".$cgi->param('num_close'). "\&prot=$fid\&user=$user&new_framework=$new_framework\&quot>show</a>";
2856                  }                  }
2857                  else                  else
2858                  {                  {
2859                      $fmg = join ('<br/>', "<a href=\&quot;protein.cgi?SPROUT=$sprout&compare_region=1\&num_close=".$cgi->param('num_close'). "\&prot=$fid\&user=$user\&quot>show</a>",                      $fmg = join ('<br/>', "<a href=\&quot;protein.cgi?SPROUT=$sprout&compare_region=1\&num_close=".$cgi->param('num_close'). "\&prot=$fid\&user=$user&new_framework=$new_framework\&quot>show</a>",
2860                              "<a onClick=\&quot;setValue('bound1', '$fid'); return false;\&quot;>set bound 1</a>",                              "<a onClick=\&quot;setValue('bound1', '$fid'); return false;\&quot;>set bound 1</a>",
2861                              "<a onClick=\&quot;setValue('bound2', '$fid'); return false;\&quot;>set bound 2</a>",                              "<a onClick=\&quot;setValue('bound2', '$fid'); return false;\&quot;>set bound 2</a>",
2862                              "<a onClick=\&quot;setValue('candidates', '$fid'); return false;\&quot;>set candidate</a>");                              "<a onClick=\&quot;setValue('candidates', '$fid'); return false;\&quot;>set candidate</a>");

Legend:
Removed from v.1.205  
changed lines
  Added in v.1.206

MCS Webmaster
ViewVC Help
Powered by ViewVC 1.0.3