Changeset 380

Timestamp:

11/14/07 00:22:10 (2 years ago)

Author:

eevee

Message:

Replaced the table with links to the search when the table would have > 50 rows. Displayed 'other' moves. Bit of cleanup. (#81)

Location:

veekun/trunk

Files:

• lib/Vee/Controller/Dex.pm (modified) (3 diffs)
• templates/dex/page/move.tt (modified) (4 diffs)

veekun/trunk/lib/Vee/Controller/Dex.pm

@@ -16 +16 @@
 # TODO: move this somewhere shared
 my $MAX_WILDCARD_RESULTS = 10;  # maximum wildcard matches per category
+my $MAX_LEARNERS = 50;  # maximum learners per method on a move page
 
 =head1 NAME
@@ -982 +983 @@
         my $method = 'other';
         $method = $pm->method if $valid_methods{ $pm->method };
-        for my $ver (split /,/, $pm->version) {
+        my @versions;
+
+        if ($method eq 'other') {
+            # XXX: this will break if there are more other moves than the max
+            @versions = ('all');
+        } else {
+            @versions = split /,/, $pm->version;
+        }
+
+        for my $ver (@versions) {
             $pokemon_hash{$method}{$pm->pokeid}{pokemon} ||= $pm->pokemon;
             $pokemon_hash{$method}{$pm->pokeid}{$ver} = $pm->level || 1;
@@ -991 +1001 @@
     my %learners;  # method => [ version => level, pokemon => pokemon ]
     for my $method (keys %pokemon_hash) {
-        @{ $learners{$method} } = sort { $a->{pokemon}->name cmp $b->{pokemon}->name } values %{ $pokemon_hash{$method} };
+        my @sorted_learners = sort {
+            $a->{pokemon}->name cmp $b->{pokemon}->name
+        } values %{ $pokemon_hash{$method} };
+        
+        if (@sorted_learners > $MAX_LEARNERS) {
+            $learners{$method} = {};
+            for my $learner_hash (@sorted_learners) {
+                for my $version (keys %$learner_hash) {
+                    $learners{$method}{$version}++;
+                }
+            }
+        } else {
+            $learners{$method} = \@sorted_learners;
+        }
     }
 

veekun/trunk/templates/dex/page/move.tt

@@ -178 +178 @@
 <!-- ####################################################################### -->
 
+<h1>Pok&eacute;mon</h1>
+<p> <a href="[% c.uri_for('pokemon/search', { move => this.name }) %]"><img src="/images/see-also.png" alt="See also:"/> All [% pokemon_count %] in the Pok&eacute;mon search</a> </p>
+
 [% learn_versions = ['rb','y','gs','c','rusa','frlg','dp'] %]
 
 [% IF learners.level %]
 <h2>By leveling up</h2>
+<p class="total">[% learners.level.size %] Pok&eacute;mon</p>
 <table cellspacing="0" class="dex-table dex-pokemon">
 <tr class="heading">
@@ -211 +215 @@
 [%     END %]
 </table>
-<div class="total">Level-up Pok&eacute;mon: [% learners.level.size %]</div>
 [% END %]
 
@@ -219 +222 @@
 [% tutor_versions = ['c','e','frlg','dp'] %]
 [% machine_versions = ['rby','gsc','rsfl','dp'] %]
+[% other_versions = [] %]
 [% versions_map = { 'rby' => 'y', 'gsc' => 'c', 'rsfl' => 'rusa' } %]
 
-<h1>Pok&eacute;mon</h1>
-<p> <a href="[% c.uri_for('pokemon/search', { move => this.name }) %]"><img src="/images/see-also.png" alt="See also:"/> This move in the Pok&eacute;mon search</a> </p>
-
 [%# TODO: yellow/crystal-only TMs %]
 
-[% FOREACH method IN ['machine', 'egg', 'tutor'] %]
+[% FOREACH method IN ['machine', 'egg', 'tutor', 'other'] %]
 [%     NEXT IF NOT learners.exists(method) %]
 [%     list = learners.$method %]
+[%     tmp = method _ '_versions'; our_versions = $tmp %]
 <h2>[% method | ucfirst %]</h2>
+[%     IF list.exists('pokemon')  # this is a too-big hash %]
+<p> Too many to list! </p>
+<ul>
+[%         FOR version IN our_versions %]
+[%             specific_version = versions_map.exists(version) ? versions_map.$version : version %]
+    <li> <a href="[% c.uri_for('pokemon/search', { move => this.name, move_method => method, move_version => specific_version }) %]">[% Icons.$version +%] [%+ list.$specific_version %]</a> </li>
+[%         END %]
+    <li> <a href="[% c.uri_for('pokemon/search', { move => this.name, move_method => method }) %]">Total: [% list.$specific_version %]</a> </li>
+</ul>
+[%         NEXT %]
+[%     END %]
+<p class="total">[% list.size %] Pok&eacute;mon</p>
 <table cellspacing="0" class="dex-table dex-pokemon">
 <tr class="heading">
-[%     tmp = method _ '_versions'; our_versions = $tmp %]
 [%     FOREACH version IN our_versions %]
     <th class="level">[% Icons.$version %]</th>
@@ -261 +274 @@
 [%     END %]
 </table>
-<div class="total">[% list.size %] Pok&eacute;mon</div>
-[% END %]
-
-<hr/>
-<div class="total">Total Pok&eacute;mon: [% pokemon_count %]</div>
+[% END %]
 
 <!-- ####################################################################### -->