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

Diff of /FigWebServices/subsys.cgi

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

revision 1.3, Sat Sep 11 13:23:47 2004 UTC revision 1.4, Fri Sep 17 00:56:04 2004 UTC
# Line 908  Line 908 
908    
909      if ($nameCS ne "All")      if ($nameCS ne "All")
910      {      {
911          my $subset = $nameCS ? join(",",map { $subsystem->get_role_index($_) + 1 } $subsystem->get_subsetC($nameCS)) : "";          my $subset = $nameCS ? join(",",map { $subsystem->get_role_index($_) + 1 } $subsystem->get_subsetC_roles($nameCS)) : "";
912          my($posT,$subsetT);          my($posT,$subsetT);
913          if ($cgi->param('can_alter'))          if ($cgi->param('can_alter'))
914          {          {
# Line 941  Line 941 
941      my $active_subsetC = ($cgi->param('active_subsetC') or $subsystem->get_active_subsetC );      my $active_subsetC = ($cgi->param('active_subsetC') or $subsystem->get_active_subsetC );
942      my $active_subsetR = ($cgi->param('active_subsetR') or $subsystem->get_active_subsetR );      my $active_subsetR = ($cgi->param('active_subsetR') or $subsystem->get_active_subsetR );
943    
944      my @subsetC = $subsystem->get_subsetC($active_subsetC);      my @subsetC = $subsystem->get_subsetC_roles($active_subsetC);
945      my %activeC = map { $_ => 1 } @subsetC;      my %activeC = map { $_ => 1 } @subsetC;
946    
947      my @subsetR = $subsystem->get_subsetR($active_subsetR);      my @subsetR = $subsystem->get_subsetR($active_subsetR);
# Line 952  Line 952 
952          my $subset;          my $subset;
953          foreach $subset (grep { $_ =~ /^\*/ } $subsystem->get_subset_namesC)          foreach $subset (grep { $_ =~ /^\*/ } $subsystem->get_subset_namesC)
954          {          {
955              my @mem = grep { $activeC{$_} } $subsystem->get_subsetC($subset);              my @mem = grep { $activeC{$_} } $subsystem->get_subsetC_roles($subset);
956              if (@mem > 1)              if (@mem > 1)
957              {              {
958                  my $mem = [@mem];                  my $mem = [@mem];
# Line 1351  Line 1351 
1351      my $active_subsetC = ($cgi->param('active_subsetC') or $subsystem->get_active_subsetC );      my $active_subsetC = ($cgi->param('active_subsetC') or $subsystem->get_active_subsetC );
1352      my $active_subsetR = ($cgi->param('active_subsetR') or $subsystem->get_active_subsetR );      my $active_subsetR = ($cgi->param('active_subsetR') or $subsystem->get_active_subsetR );
1353    
1354      my @subsetC = $subsystem->get_subsetC($active_subsetC);      my @subsetC = $subsystem->get_subsetC_roles($active_subsetC);
1355      my %activeC = map { $_ => 1 } @subsetC;      my %activeC = map { $_ => 1 } @subsetC;
1356    
1357      my @subsetR = $subsystem->get_subsetR($active_subsetR);      my @subsetR = $subsystem->get_subsetR($active_subsetR);
# Line 1360  Line 1360 
1360      my($set,$col,%in);      my($set,$col,%in);
1361      foreach $set (@alt_sets)      foreach $set (@alt_sets)
1362      {      {
1363          my @mem = grep { $activeC{$_} } $subsystem->get_subsetC($set);          my @mem = grep { $activeC{$_} } $subsystem->get_subsetC_roles($set);
1364          foreach $col (@mem)          foreach $col (@mem)
1365          {          {
1366              $in{$col} = $set;              $in{$col} = $set;
# Line 1415  Line 1415 
1415              my($set);              my($set);
1416              if (($set = $in->{$role}) && (! $cgi->param('ignore_alt')))              if (($set = $in->{$role}) && (! $cgi->param('ignore_alt')))
1417              {              {
1418                  my @set = $subsystem->get_subsetS($set);                  my @set = $subsystem->get_subsetC_roles($set);
1419    
1420                  my($k);                  my($k);
1421                  for ($k=0; ($k < @set) && $missing_cols{$set[$k]}; $k++) {}                  for ($k=0; ($k < @set) && $missing_cols{$set[$k]}; $k++) {}
# Line 1443  Line 1443 
1443      my $active_subsetC = ($cgi->param('active_subsetC') or $subsystem->get_active_subsetC );      my $active_subsetC = ($cgi->param('active_subsetC') or $subsystem->get_active_subsetC );
1444      my $active_subsetR = ($cgi->param('active_subsetR') or $subsystem->get_active_subsetR );      my $active_subsetR = ($cgi->param('active_subsetR') or $subsystem->get_active_subsetR );
1445    
1446      my @subsetC = $subsystem->get_subsetC($active_subsetC);      my @subsetC = $subsystem->get_subsetC_roles($active_subsetC);
1447      my %activeC = map { $_ => 1 } @subsetC;      my %activeC = map { $_ => 1 } @subsetC;
1448    
1449      my @subsetR = $subsystem->get_subsetR($active_subsetR);      my @subsetR = $subsystem->get_subsetR($active_subsetR);
# Line 1452  Line 1452 
1452      my($set,$col,%in);      my($set,$col,%in);
1453      foreach $set (@alt_sets)      foreach $set (@alt_sets)
1454      {      {
1455          my @mem = grep { $activeC{$_} } $subsystem->get_subsetC($set);          my @mem = grep { $activeC{$_} } $subsystem->get_subsetC_roles($set);
1456          foreach $col (@mem)          foreach $col (@mem)
1457          {          {
1458              $in{$col} = $set;              $in{$col} = $set;
# Line 1539  Line 1539 
1539      my $active_subsetC = ($cgi->param('active_subsetC') or $subsystem->get_active_subsetC );      my $active_subsetC = ($cgi->param('active_subsetC') or $subsystem->get_active_subsetC );
1540      my $active_subsetR = ($cgi->param('active_subsetR') or $subsystem->get_active_subsetR );      my $active_subsetR = ($cgi->param('active_subsetR') or $subsystem->get_active_subsetR );
1541    
1542      my @subsetC = $subsystem->get_subsetC($active_subsetC);      my @subsetC = $subsystem->get_subsetC_roles($active_subsetC);
1543      my %activeC = map { $_ => 1 } @subsetC;      my %activeC = map { $_ => 1 } @subsetC;
1544    
1545      my @subsetR = $subsystem->get_subsetR($active_subsetR);      my @subsetR = $subsystem->get_subsetR($active_subsetR);
# Line 1612  Line 1612 
1612      my $active_subsetC = ($cgi->param('active_subsetC') or $subsystem->get_active_subsetC );      my $active_subsetC = ($cgi->param('active_subsetC') or $subsystem->get_active_subsetC );
1613      my $active_subsetR = ($cgi->param('active_subsetR') or $subsystem->get_active_subsetR );      my $active_subsetR = ($cgi->param('active_subsetR') or $subsystem->get_active_subsetR );
1614    
1615      my @subsetC = $subsystem->get_subsetC($active_subsetC);      my @subsetC = $subsystem->get_subsetC_roles($active_subsetC);
1616      my %activeC = map { $_ => 1 } @subsetC;      my %activeC = map { $_ => 1 } @subsetC;
1617    
1618      my @subsetR = $subsystem->get_subsetR($active_subsetR);      my @subsetR = $subsystem->get_subsetR($active_subsetR);
# Line 1652  Line 1652 
1652      my $active_subsetC = ($cgi->param('active_subsetC') or $subsystem->get_active_subsetC );      my $active_subsetC = ($cgi->param('active_subsetC') or $subsystem->get_active_subsetC );
1653      my $active_subsetR = ($cgi->param('active_subsetR') or $subsystem->get_active_subsetR );      my $active_subsetR = ($cgi->param('active_subsetR') or $subsystem->get_active_subsetR );
1654    
1655      my @subsetC = $subsystem->get_subsetC($active_subsetC);      my @subsetC = $subsystem->get_subsetC_roles($active_subsetC);
1656      my %activeC = map { $_ => 1 } @subsetC;      my %activeC = map { $_ => 1 } @subsetC;
1657    
1658      my @subsetR = $subsystem->get_subsetR($active_subsetR);      my @subsetR = $subsystem->get_subsetR($active_subsetR);

Legend:
Removed from v.1.3  
changed lines
  Added in v.1.4

MCS Webmaster
ViewVC Help
Powered by ViewVC 1.0.3