Changeset 19

Timestamp:

02/23/07 21:09:57 (3 years ago)

Author:

eevee

Message:

Removed what I think are the last major database slurps.
Assorted other minor cleanup.

Location:

veekun

Files:

• lib/Vee/Controller/Dex.pm (modified) (9 diffs)
• lib/Vee/Controller/Shoutbox.pm (modified) (1 diff)
• lib/Vee/Controller/Users/Messages.pm (modified) (1 diff)
• templates/dex/list/abilities.tt (modified) (1 diff)
• templates/dex/page/pokemon.tt (modified) (1 diff)
• templates/dex/page/type.tt (modified) (1 diff)
• templates/shoutbox.tt (modified) (1 diff)
• templates/users/messages/list.tt (modified) (1 diff)

veekun/lib/Vee/Controller/Dex.pm

@@ -208 +208 @@
     my $s = $c->stash;
     
-    $s->{list} = [ $c->model('DBIC::Abilities')->search({ id => { '<' => 200 } }, { order_by => 'id ASC' }) ];
+    $s->{list} = $c->model('DBIC::Abilities')->search({ id => { '<' => 200 } }, { order_by => 'id ASC' });
     
     my %pokemon;
-    my @pokemon_list = $c->model('DBIC::Pokemon')->search({
+    my $pokemon_list = $c->model('DBIC::Pokemon')->search({
         id => { '<=' => $Generations[-1]{maxid} }
     }, {
         columns => [qw/id ability1id ability2id/]
     });
-    for my $poke (@pokemon_list) {
+    while (my $poke = $pokemon_list->next) {
         push @{ $pokemon{$poke->ability1id} }, $poke->id;
         push @{ $pokemon{$poke->ability2id} }, $poke->id;
@@ -367 +367 @@
     # breeding
     my ($breed1, $breed2) = ($row->breed1, $row->breed2 || $row->breed1);
-    $s->{breedables} = [ $c->model('DBIC::Pokemon')->search(
+    $s->{breedables} = $c->model('DBIC::Pokemon')->search(
         \ "breed1 IN ($breed1, $breed2) OR breed2 IN ($breed1, $breed2)",
         { columns => [qw/id name gender/], group_by => 'evid', order_by => 'id ASC' }
-    ) ];
+    );
 
     # moves
@@ -631 +631 @@
 
     my $row = get_row($c, 'Pokemon', $poke);
-    # TODO: log these blah blah blah
     $c->vee_abort('There is no such Pok&eacute;mon ', $poke, '.  If you are messing with my URLs, please stop.  If you came here via a link, please inform its owner that it is invalid.') unless $row;
 
@@ -638 +637 @@
     calculate_stats($c, $row);
     
-    my @moves = $c->model('DBIC::PokeMoves')->search({ pokeid => $row->id, -and => \ "FIND_IN_SET('$gen', version)" });
+    my $moves = $c->model('DBIC::PokeMoves')->search({ pokeid => $row->id, -and => \ "FIND_IN_SET('$gen', version)" });
     my %moves;
 
-    for my $move_row (@moves) {
+    while (my $move_row = $moves->next) {
         push @{ $moves{ $move_row->moveid } }, $move_row;
     }
@@ -648 +647 @@
     $s->{this} = $row;
 
-    $s->{page_title } = $row->name . ' - Strategic Overview';
-    $s->{crumbs     } = [
+    $s->{page_title} = $row->name . ' - Strategic Overview';
+    $s->{crumbs}     = [
         '<a href="' . $c->uri('Dex') . '">Pok&eacute;dex</a>',
         '<a href="' . $c->uri('Dex', 'pokemon_list') . '">Pok&eacute;mon</a>',
@@ -685 +684 @@
 
     my $row = get_row($c, 'Types');
-    $c->vee_abort('There is no such type ', $c->req->args->[0], '.  If you are messing with my URLs, please stop.  If you came here via a link, please inform its owner that it is invalid.') unless $row;
-
-    $s->{hid}        = $row->internalid + 1;
-    $s->{generation} = ($row->name eq 'dark' || $row->name eq 'steel') ? 1 : 0;
-
-    $s->{page_title } = ucfirst($row->name) . ' - Type #' . $s->{hid};
+    $c->vee_abort('There is no such type ', $c->req->args->[0], '.  If you are messing with my URLs, please stop.  If you came here via a link, please inform its owner that it is invalid.')
+        unless $row;
+
+    $s->{hid}         = $row->internalid + 1;
+    $s->{generation}  = ($row->name eq 'dark' || $row->name eq 'steel') ? 1 : 0;
+
+    $s->{page_title}  = ucfirst($row->name) . ' - Type #' . $s->{hid};
     $s->{page_header} = ucfirst $row->name;
-    $s->{link_name  } = 'dex';
-    $s->{crumbs     } = [
+    $s->{link_name}   = 'dex';
+    $s->{crumbs}      = [
         '<a href="' . $c->uri('Dex') . '">Pok&eacute;dex</a>',
         '<a href="' . $c->uri('Dex', 'type_list') . '">Types</a>',
@@ -699 +699 @@
     ];
     
-    $s->{this   } = $row;
-    $s->{pokemon} = [ $c->model('DBIC::Pokemon')->search(
+    $s->{this}    = $row;
+    $s->{pokemon} = $c->model('DBIC::Pokemon')->search(
         [ type1 => $row->name, type2 => $row->name ],
         { order_by => 'name ASC', columns => [qw/id name type1 type2/] }
-    ) ];
-    $s->{moves  } = [ $c->model('DBIC::Moves')->search({ type => $row->name }, { order_by => 'name ASC', columns => ['id'] }) ];
+    );
+    $s->{moves}   = $c->model('DBIC::Moves')->search({ type => $row->name }, { order_by => 'name ASC', columns => ['id'] });
 
     $s->{template} = 'dex/page/type.tt';
@@ -723 +723 @@
 
     if ($search) {
-        # XXX: could use a better sorting mechanism here
-        # XXX: substr etc would probably be faster and less regex-injection-prone
-        push @suggestions, grep { /^$search/i } @PokemonNames[ 1 .. $#PokemonNames ];
-        push @suggestions, grep { /^$search/i } map { $_->name } @MoveData[ 1 .. $#MoveData ];
-        push @suggestions, grep { /^$search/i } @TypeNames[ 1 .. $#TypeNames ];
+        my $len = length $search;
+        $search = lc $search;
+        # TODO: could use a better sorting mechanism here
+        push @suggestions, grep { $search eq lc substr $_, 0, $len } @PokemonNames[ 1 .. $#PokemonNames ];
+        push @suggestions, grep { $search eq lc substr $_, 0, $len } map { $_->name } @MoveData[ 1 .. $#MoveData ];
+        push @suggestions, grep { $search eq lc substr $_, 0, $len } @TypeNames[ 1 .. $#TypeNames ];
     }
     
@@ -751 +752 @@
 
     $string =~ tr/a-z!? //cd;
-    $s->{string} = $string;
-    $s->{dir} = $dir;
+    $s->{string}   = $string;
+    $s->{dir}      = $dir;
     $s->{template} = 'dex/eggs/annon.tt';
 }

veekun/lib/Vee/Controller/Shoutbox.pm

@@ -37 +37 @@
     $s->{extra_css} = 'index';
 
-    $s->{shouts} = [ $c->model('DBIC::Shoutbox')->search(
-        undef,
-        {
-            order_by => 'time DESC',
-            prefetch => ['user'],
-            rows     => $c->site_opts->{page_sizes}{shoutbox},
-            offset   => $skip,
-        }
-    ) ];
+    $s->{shouts} = $c->model('DBIC::Shoutbox')->search(undef, {
+        order_by => 'time DESC',
+        prefetch => ['user'],
+        rows     => $c->site_opts->{page_sizes}{shoutbox},
+        offset   => $skip,
+    });
     
     $s->{shout_total} = $c->model('DBIC::Shoutbox')->count;

veekun/lib/Vee/Controller/Users/Messages.pm

@@ -43 +43 @@
     my $skip = $c->req->params->{skip} || 0;
 
-    $s->{messages} = [ $c->model('DBIC::Messages')->search({ to_user_id => $c->user->obj->id }, { rows => 50, offset => $skip }) ];
+    $s->{messages} = $c->model('DBIC::Messages')->search({ to_user_id => $c->user->obj->id }, { rows => 50, offset => $skip });
     
     $s->{page_title} = 'Messages';

veekun/templates/dex/list/abilities.tt

@@ -5 +5 @@
 <tr><th> [% Icons.rsefl %] </th><th> Name </th><th> Effect </th><th colspan="2"> Pok&eacute;mon </th></tr>
 [% color = 1 %]
-[% FOREACH abil IN list %]
+[% WHILE (abil = list.next) %]
 <tr class="color[% color %]">
 <td> [% abil.id %] </td>

veekun/templates/dex/page/pokemon.tt

@@ -265 +265 @@
 <p>Also remember that any gendered Pok&eacute;mon can breed with <a href="[% dex_uri('pokemon', 'ditto') %]">Ditto</a>.</p>
 <p>[ <a href="[% tmp = this.breed2 ? [ this.breed1, this.breed2 ] : this.breed1; c.uri('Dex::Search', 'pokemon_search', { breed_mode => 'or', breed => tmp, baseform => 'on' }) %]">baseform Pok&eacute;mon that can breed with [% this.name %]</a> (equivalent to this list); <a href="[% c.uri('Dex::Search', 'pokemon_search', { breed_mode => 'or', breed => tmp }) %]">all Pok&eacute;mon that can breed with [% this.name %]</a> ]</p>
-[%     FOR pokemon IN breedables %]
+[%     WHILE (pokemon = breedables.next) %]
 <a href="[% dex_uri('pokemon', PokemonNames.${pokemon.id}) %]" class="dex-pokelist[% pokemon.gender == 255 ? ' genderless' : '' %]"><img src="/dex-images/icons/[% pokemon.id.pad(3) %].png" alt="[% PokemonNames.${pokemon.id} %]" title="[% PokemonNames.${pokemon.id} %]"/></a>
 [%     END %]

veekun/templates/dex/page/type.tt

@@ -58 +58 @@
 <h1>Pok&eacute;mon</h1>
 <p><a href="[% c.uri('Dex::Search', 'pokemon_search', { view => 'icons', type_mode => 'any', type => this.name }) %]">This type in the Pok&eacute;mon search</a></p>
-[% FOREACH poke IN pokemon %]
+[% WHILE (poke = pokemon.next) %]
 <a href="[% dex_uri('pokemon', poke.name) %]" class="[% IF poke.type2; 'type-'; IF poke.type1 == this.name; poke.type2; ELSE; poke.type1; END; ' '; END %]dex-pokelist"><img src="/dex-images/icons/[% poke.id.pad(3) %].png" alt="[% poke.name %]" title="[% poke.name %]: [% poke.type1 %][% '/' _ poke.type2 IF poke.type2 %]"/></a>
 [% END %]

veekun/templates/shoutbox.tt

@@ -12 +12 @@
 [% can_ip = c.can_i('ip') %]
 <table class="big shoutlist" cellspacing="0">
-[% FOREACH s IN shouts %]
+[% WHILE (s = shouts.next) %]
 <tr>
   <td class="center shout-time" title="[% time - s.time | timespan %] ago">[% s.time | date %]</td>

veekun/templates/users/messages/list.tt

@@ -3 +3 @@
 [% color = 1 %]
 <table cellspacing="0">
-[% FOREACH message IN messages %]
+[% WHILE (message = messages.next) %]
 <tr>
   <td> [% message.sender %] </td> <td> [% message.subject %] </td> <td> [% message.time %] </td>