[Bio] / Sprout / Sprout.pm Repository:
ViewVC logotype

Diff of /Sprout/Sprout.pm

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

revision 1.111, Wed May 7 23:11:51 2008 UTC revision 1.113, Tue Aug 12 06:01:49 2008 UTC
# Line 552  Line 552 
552      if (ref $selections ne 'ARRAY') {      if (ref $selections ne 'ARRAY') {
553          $selections = [ split /\s*,\s*/, $selections ];          $selections = [ split /\s*,\s*/, $selections ];
554      }      }
555      my %selected = map { $_ => } @{$selections};      my %selected = map { $_ => 1 } @{$selections};
556      # Extract the filter information. The default is no filtering. It can be passed as a tab-delimited      # Extract the filter information. The default is no filtering. It can be passed as a tab-delimited
557      # string or a list reference.      # string or a list reference.
558      my $filterParms = $options{filter} || "";      my $filterParms = $options{filter} || "";
# Line 1962  Line 1962 
1962      if ($featureID =~ /^fig\|(\d+\.\d+)/) {      if ($featureID =~ /^fig\|(\d+\.\d+)/) {
1963          $retVal = $1;          $retVal = $1;
1964      } else {      } else {
1965            # Find the feature by alias.
1966            my ($realFeatureID) = $self->FeaturesByAlias($featureID);
1967            if ($realFeatureID && $realFeatureID =~ /^fig\|(\d+\.\d+)/) {
1968                $retVal = $1;
1969            } else {
1970                # Use the external table.
1971                my ($org) = $self->GetFlat(['ExternalAliasOrg'], "ExternalAliasOrg(id) = ?",
1972                                           [$featureID], "ExternalAliasOrg(org)");
1973                if ($org) {
1974                    $retVal = $org;
1975                } else {
1976          Confess("Invalid feature ID $featureID.");          Confess("Invalid feature ID $featureID.");
1977      }      }
1978            }
1979        }
1980      # Return the value found.      # Return the value found.
1981      return $retVal;      return $retVal;
1982  }  }

Legend:
Removed from v.1.111  
changed lines
  Added in v.1.113

MCS Webmaster
ViewVC Help
Powered by ViewVC 1.0.3