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

Diff of /FigWebServices/show_exp_assertions.cgi

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

revision 1.5, Sat Mar 1 22:40:28 2008 UTC revision 1.7, Wed Mar 12 16:24:40 2008 UTC
# Line 162  Line 162 
162      return @roles;      return @roles;
163  }  }
164    
 use SOAP::Lite;  
 sub get_assertions {  
     my($fig,$pegs) = @_;  
   
     my $response = SOAP::Lite  
         -> uri('http://www.nmpdr.org/AnnoClearinghouse_SOAP')  
         -> proxy('http://bioseed.mcs.anl.gov/~paarmann/FIG/aclh-soap.cgi')  
         -> get_user_annotations( $pegs );  
   
     if (! $response) { return () }  
     my $result = $response->result;  
     if (! $result)   { return () }  
     my @assertions = ();  
     foreach my $peg (keys(%$result))  
     {  
         my $x = $result->{$peg};  
         push(@assertions,map { [$peg,@$_] } @$x);  
     }  
     return sort { &FIG::by_fig_id($a->[0],$b->[0]) } @assertions;  
 }  
   
165  sub format_roles {  sub format_roles {
166      my($cgi,$html,$fig,$roles,$subsys,$options) = @_;      my($cgi,$html,$fig,$roles,$subsys,$options) = @_;
167    
# Line 222  Line 201 
201    
202          my @assertions = sort { &FIG::by_fig_id($a->[0],$b->[0]) }          my @assertions = sort { &FIG::by_fig_id($a->[0],$b->[0]) }
203                           grep { $experts_to_show{'all'} || $experts_to_show{$_->[1]} }                           grep { $experts_to_show{'all'} || $experts_to_show{$_->[1]} }
204                           &get_assertions($fig,\@pegs);                           &FIG::get_expert_assertions(\@pegs);
205          foreach my $tuple (@assertions)          foreach my $tuple (@assertions)
206          {          {
207              my($peg,$expert,$exp_assertion) = @$tuple;              my($peg,$expert,$exp_assertion) = @$tuple;
# Line 282  Line 261 
261    
262      my $subO = $fig->get_subsystem($subsys);      my $subO = $fig->get_subsystem($subsys);
263      my @pegs = $subO->get_all_pegs;      my @pegs = $subO->get_all_pegs;
264      my @assertions = &get_assertions($fig,\@pegs);      my @assertions = &FIG::get_expert_assertions(\@pegs);
265      my %by_whom = map { $_ => 1 } map { ($_->[3] eq 'Expert') ? $_->[4] : () } @assertions;      my %by_whom = map { $_ => 1 } map { ($_->[3] eq 'Expert') ? $_->[4] : () } @assertions;
266      my @experts = sort keys(%by_whom);      my @experts = sort keys(%by_whom);
267    

Legend:
Removed from v.1.5  
changed lines
  Added in v.1.7

MCS Webmaster
ViewVC Help
Powered by ViewVC 1.0.3