Permalink
Browse files

Merge remote-tracking branch 'origin/master'

  • Loading branch information...
2 parents 42dc74f + 29c6ec5 commit cd55b551ac3cf2ae2f7d776f963f05a1e561dab6 @xiaoqi xiaoqi committed Nov 18, 2011
Showing with 10 additions and 11 deletions.
  1. +1 −1 Makefile.PL
  2. +9 −10 lib/WormBase/API/Role/Object.pm
View
@@ -120,7 +120,7 @@ requires 'Catalyst::Controller::Metal'; #
requires 'Catalyst::Helper::PSGI'; #
requires 'Starman'; #
requires 'URI::Escape::XS';
-requires 'Any::Loger::Adapter::Log4perl'; # cache logging
+requires 'Log::Any::Adapter::Log4perl'; # cache logging
install_script glob('script/*.pl');
auto_install;
@@ -248,10 +248,9 @@ has 'other_names' => (
sub _build_other_names {
my ($self) = @_;
my $object = $self->object;
- my @names = $object->Other_name;
# We will just stringify other names; no sense in linking them.
- @names = map { "$_" } @names;
+ my @names = map { "$_" } $object->Other_name;
return {
description => "other names that have been used to refer to $object",
data => @names ? \@names : undef
@@ -480,7 +479,7 @@ sub _build_best_blastp_matches {
push @hits, {
taxonomy => $taxonomy,
hit => $self->_pack_obj($hit),
- description => "$description",
+ description => $description && "$description",
evalue => sprintf("%7.3g", 10**-$best{$_}{score}),
percent => sprintf("%2.1f%%", 100 * ($best{$_}{covered}) / $length),
};
@@ -1921,13 +1920,13 @@ sub _build_xrefs {
} $db->col;
$dbs{$db} = {
- name => "$name",
- description => "$description",
- url => "$url",
- url_constructor => "$url_constructor",
- email => "$email",
+ name => $name && "$name",
+ description => $description && "$description",
+ url => $url && "$url",
+ url_constructor => $url_constructor && "$url_constructor",
+ email => $email && "$email",
+ label => $remote_text && "$remote_text",
ids => \@ids,
- label => "$remote_text"
};
}
@@ -1936,7 +1935,7 @@ sub _build_xrefs {
return {
description => 'external databases and IDs containing additional information on the object',
- data => %dbs ? \%dbs : undef,
+ data => %dbs ? \%dbs : undef,
};
}

0 comments on commit cd55b55

Please sign in to comment.