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

Diff of /FigKernelPackages/Observation.pm

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

revision 1.34, Mon Aug 27 21:39:52 2007 UTC revision 1.35, Wed Aug 29 15:19:59 2007 UTC
# Line 1829  Line 1829 
1829  =cut  =cut
1830    
1831  sub display_table {  sub display_table {
1832      my ($self,$dataset, $columns, $query_fid) = @_;      my ($self,$dataset, $scroll_list, $query_fid) = @_;
1833    
1834      my $data = [];      my $data = [];
1835      my $count = 0;      my $count = 0;
# Line 1843  Line 1843 
1843      }      }
1844    
1845      my (%box_column, %subsystems_column, %evidence_column, %e_identical);      my (%box_column, %subsystems_column, %evidence_column, %e_identical);
1846      foreach my $col (@$columns){  
1847          # get the column for the subsystems          # get the column for the subsystems
         if ($col eq "subsystem"){  
1848              %subsystems_column = &get_subsystems_column(\@ids);              %subsystems_column = &get_subsystems_column(\@ids);
1849          }  
1850          # get the column for the evidence codes          # get the column for the evidence codes
         elsif ($col eq "evidence"){  
1851              %evidence_column = &get_evidence_column(\@ids);              %evidence_column = &get_evidence_column(\@ids);
1852          }  
1853          # get the column for pfam_domain          # get the column for pfam_domain
         elsif ($col eq "pfam_domains"){  
1854              %pfam_column = &get_pfam_column(\@ids);              %pfam_column = &get_pfam_column(\@ids);
         }  
     }  
1855    
1856      my %e_identical = &get_essentially_identical($query_fid);      my %e_identical = &get_essentially_identical($query_fid);
1857      my $all_aliases = $fig->feature_aliases_bulk(\@ids);      my $all_aliases = $fig->feature_aliases_bulk(\@ids);
# Line 1902  Line 1897 
1897          push(@$single_domain,$reg2);                           # permanent column          push(@$single_domain,$reg2);                           # permanent column
1898          push(@$single_domain,$thing->organism);                # permanent column          push(@$single_domain,$thing->organism);                # permanent column
1899          push(@$single_domain,$thing->function);                # permanent column          push(@$single_domain,$thing->function);                # permanent column
1900          foreach my $col (@$columns){          foreach my $col (sort keys %$scroll_list){
1901              (push(@$single_domain,$subsystems_column{$id}) && (next)) if ($col eq "subsystem");              if ($col =~ /associated_subsystem/)          {push(@$single_domain,$subsystems_column{$id});}
1902              (push(@$single_domain,$evidence_column{$id}) && (next)) if ($col eq "evidence");              elsif ($col =~ /evidence/)                   {push(@$single_domain,$evidence_column{$id});}
1903              (push(@$single_domain,$pfam_column{$id}) && (next)) if ($col eq "pfam_domains");              elsif ($col =~ /pfam_domains/)               {push(@$single_domain,$pfam_column{$id});}
1904  #           (push(@$single_domain,@{$$all_aliases{$id}}[0]) && (next)) if ($col eq "ncbi_id");              elsif ($col =~ /ncbi_id/)                    {push(@$single_domain,&get_prefer($thing->acc, 'NCBI', $all_aliases));}
1905              (push(@$single_domain,&get_prefer($thing->acc, 'NCBI', $all_aliases)) && (next)) if ($col eq "ncbi_id");              elsif ($col =~ /refseq_id/)                  {push(@$single_domain,&get_prefer($thing->acc, 'RefSeq', $all_aliases));}
1906              (push(@$single_domain,&get_prefer($thing->acc, 'RefSeq', $all_aliases)) && (next)) if ($col eq "refseq_id");              elsif ($col =~ /swissprot_id/)               {push(@$single_domain,&get_prefer($thing->acc, 'SwissProt', $all_aliases));}
1907              (push(@$single_domain,&get_prefer($thing->acc, 'SwissProt', $all_aliases)) && (next)) if ($col eq "swissprot_id");              elsif ($col =~ /uniprot_id/)                 {push(@$single_domain,&get_prefer($thing->acc, 'UniProt', $all_aliases));}
1908              (push(@$single_domain,&get_prefer($thing->acc, 'UniProt', $all_aliases)) && (next)) if ($col eq "uniprot_id");              elsif ($col =~ /tigr_id/)                    {push(@$single_domain,&get_prefer($thing->acc, 'TIGR', $all_aliases));}
1909              (push(@$single_domain,&get_prefer($thing->acc, 'TIGR', $all_aliases)) && (next)) if ($col eq "tigr_id");              elsif ($col =~ /pir_id/)                     {push(@$single_domain,&get_prefer($thing->acc, 'PIR', $all_aliases));}
1910              (push(@$single_domain,&get_prefer($thing->acc, 'PIR', $all_aliases)) && (next)) if ($col eq "pir_id");              elsif ($col =~ /kegg_id/)                    {push(@$single_domain,&get_prefer($thing->acc, 'KEGG', $all_aliases));}
1911              (push(@$single_domain,&get_prefer($thing->acc, 'KEGG', $all_aliases)) && (next)) if ($col eq "kegg_id");              elsif ($col =~ /trembl_id/)                  {push(@$single_domain,&get_prefer($thing->acc, 'TrEMBL', $all_aliases));}
1912              (push(@$single_domain,&get_prefer($thing->acc, 'TrEMBL', $all_aliases)) && (next)) if ($col eq "trembl_id");              elsif ($col =~ /asap_id/)                    {push(@$single_domain,&get_prefer($thing->acc, 'ASAP', $all_aliases));}
1913              (push(@$single_domain,&get_prefer($thing->acc, 'ASAP', $all_aliases)) && (next)) if ($col eq "asap_id");              elsif ($col =~ /jgi_id/)                     {push(@$single_domain,&get_prefer($thing->acc, 'JGI', $all_aliases));}
             (push(@$single_domain,&get_prefer($thing->acc, 'JGI', $all_aliases)) && (next)) if ($col eq "jgi_id");  
1914          }          }
1915          push(@$data,$single_domain);          push(@$data,$single_domain);
1916      }      }

Legend:
Removed from v.1.34  
changed lines
  Added in v.1.35

MCS Webmaster
ViewVC Help
Powered by ViewVC 1.0.3