[Bio] / FigKernelPackages / FIG.pm Repository:
ViewVC logotype

Diff of /FigKernelPackages/FIG.pm

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

revision 1.805, Fri Oct 23 18:51:49 2009 UTC revision 1.806, Fri Nov 6 23:44:59 2009 UTC
# Line 7723  Line 7723 
7723    }    }
7724    
7725    my $rdbH = $self->db_handle;    my $rdbH = $self->db_handle;
7726    my $relational_db_response = $rdbH->SQL("SELECT id, location, aliases, type, minloc, maxloc, assigned_function, made_by, quality FROM (SELECT id, location, aliases, type, minloc, maxloc FROM features LEFT OUTER JOIN deleted_fids ON features.id = deleted_fids.fid WHERE features.genome = '" . $genome . "' " . $contig_line . $minmax . "AND fid IS NULL) AS t1 LEFT OUTER JOIN assigned_functions on t1.id = assigned_functions.prot");  
7727      my $relational_db_response = $rdbH->SQL("SELECT DISTINCT id, location, aliases, type, minloc, maxloc, assigned_function, made_by, quality FROM (SELECT id, location, aliases, type, minloc, maxloc FROM features LEFT OUTER JOIN deleted_fids ON features.id = deleted_fids.fid WHERE features.genome = '" . $genome . "' " . $contig_line . $minmax . "AND fid IS NULL) AS t1 LEFT OUTER JOIN assigned_functions on t1.id = assigned_functions.prot");
7728    
7729    return $relational_db_response || ();    return $relational_db_response || ();
7730    
# Line 10637  Line 10638 
10638          my @maps_to = $self->mapped_prot_ids( $id2 );          my @maps_to = $self->mapped_prot_ids( $id2 );
10639          my $ref_len = $maps_to[0]->[1];          my $ref_len = $maps_to[0]->[1];
10640    
10641          @maps_to = grep { $_->[0] !~ /^xxx\d+/ } @maps_to;          @maps_to = grep { $_->[0] !~ /^xxx\d+/ } grep { $_->[0] !~ /^gnl\|md5/ } @maps_to;
10642    
10643          if ( $select =~ /^figx?$/ )          # Only fig          if ( $select =~ /^figx?$/ )          # Only fig
10644          {          {
# Line 10754  Line 10755 
10755              # equivalent proteins found.              # equivalent proteins found.
10756              #              #
10757    
10758              my @maps_to = grep { $_->[0] !~ /^xxx\d+/ } $self->mapped_prot_ids( $id2 );              my @maps_to = grep { $_->[0] !~ /^xxx\d+/ } grep { $_->[0] !~ /^gnl\|md5/ }  $self->mapped_prot_ids( $id2 );
10759              if ( $select =~ /^figx?$/ )          # Only fig              if ( $select =~ /^figx?$/ )          # Only fig
10760              {              {
10761                  @relevant = grep { $_->[0] =~ /^fig/ } @maps_to;                  @relevant = grep { $_->[0] =~ /^fig/ } @maps_to;

Legend:
Removed from v.1.805  
changed lines
  Added in v.1.806

MCS Webmaster
ViewVC Help
Powered by ViewVC 1.0.3