Changeset 344

Timestamp:

10/15/07 21:45:11 (2 years ago)

Author:

eevee

Message:

Lowered the non-wildcard-character limit to 2 (for now).
Added wildcard support to the searches.
Cleaned up wildcard display a bit.

Location:

veekun/trunk

Files:

• lib/Vee/Controller/Dex.pm (modified) (3 diffs)
• lib/Vee/Controller/Dex/Search.pm (modified) (2 diffs)
• t/dex-search.t (modified) (2 diffs)
• templates/dex/lookup/wildcard.tt (modified) (1 diff)
• templates/dex/search/moves.tt (modified) (1 diff)

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

@@ -13 +13 @@
 use Storable qw/dclone/;
 use Data::Dumper;
+
+# TODO: move this somewhere shared
+my $MAX_WILDCARD_RESULTS = 10;  # maximum wildcard matches per category
 
 =head1 NAME
@@ -171 +174 @@
     
     (my $test = $entry) =~ s/[^-_ 0-9a-zA-Z]//g;
-    if (3 > length $test) {
+    if (2 > length $test) {
         $c->vee_abort('Your entry ', $entry, ' is too vague.  Please try to tone down the use of wildcards.');
         die;
@@ -184 +187 @@
 
     my $re = qr/^$entry$/i;
-    my %results;
-    
-    # TODO: use %FuzzyMatches somehow
-    $results{abilities} = [ grep { $AbilityNames[$_] =~ $re } 1 .. $#AbilityNames ];
-    $results{pokemon}   = [ grep { $PokemonNames[$_] =~ $re } 1 .. $#PokemonNames ];
-    $results{types}     = [ grep { $TypeNames[$_] =~ $re } 0 .. $#TypeNames ];
-    $results{moves}     = [ grep { $MoveData[$_]->name =~ $re } 1 .. $#MoveData ];
-    
-    my $total = 0;
-    $total += $#{$results{$_}} + 1 for keys %results;
+    my (%results, %overflow);
+    
+    # Arrange the results by type
+    my @keys = grep { $_ =~ $re } keys %FuzzyMatches;
+    for my $key (@keys) {
+        my $type  = $FuzzyMatches{$key}{type};
+        my $array = ($results{$type} ||= []);
+
+        push @$array, $FuzzyMatches{$key};
+    }
+
+    # Sort by name, for lack of anything particularly better
+    for my $type (keys %results) {
+        my $array = $results{$type};
+        @$array = sort {
+            $a->{name} cmp $b->{name}
+        } @$array;
+
+        # Don't go crazy listing matches
+        if (@$array > $MAX_WILDCARD_RESULTS) {
+            @$array = @$array[ 0 .. $MAX_WILDCARD_RESULTS - 1 ];
+            $overflow{$type} = 1;
+        }
+    }
+
+    my $total = @keys;
     $c->vee_stop('No match for ', $orig, ' was found.  You may wish to try the <a href="' . $c->uri('Dex', 'pokemon_list') . '">Pok&eacute;mon list</a>, <a href="' . $c->uri('Dex', 'move_list') . '">move list</a>, <a href="' . $c->uri('Dex', 'type_list') . '">type list</a>, etc. to find what you are looking for.') unless $total;
-    $c->vee_stop('', $orig, ' returned too many matches.  Please try something more specific.') if $total > 50;
-    
+    
+    $s->{entry}    = $orig;
     $s->{results}  = \%results;
+    $s->{overflow} = \%overflow;
     $s->{template} = 'dex/lookup/wildcard.tt';
 }

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

@@ -109 +109 @@
         # BASIC
         if ($p->{name}) {
-            $criteria{'me.name'} = { like => '%' . $p->{name} . '%' };
+            my $name = $p->{name};
+            if ($name =~ /[*?]/) {
+                $name =~ tr/*?/%_/;
+                $criteria{'me.name'} = { like => $name };
+            } else {
+                $criteria{'me.name'} = { like => "%$name%" };
+            }
         }
         if ($p->{habitat} ne 'any') { $criteria{'me.habitat'} = $p->{habitat} }
@@ -328 +334 @@
         # BASIC
         if ($p->{name}) {
-            $criteria{name} = { LIKE => '%' . $p->{name} . '%' };
+            my $name = $p->{name};
+            if ($name =~ /[*?]/) {
+                $name =~ tr/*?/%_/;
+                $criteria{'me.name'} = { like => $name };
+            } else {
+                $criteria{'me.name'} = { like => "%$name%" };
+            }
         }
         if ($p->{class} ne 'any') { $criteria{class} = $p->{class} }

veekun/trunk/t/dex-search.t

@@ -5 +5 @@
 use lib 'lib';
 
-use Test::More tests => 34;
+use Test::More tests => 35;
 
 BEGIN { $ENV{CATALYST_DEBUG} = 0; }
@@ -21 +21 @@
     [qw/ 5 134 135 136 196 197 352 395 456 457 470 471 /],
     "Name substring";
+
+search_ok { name => '???' },
+    [qw/ 89 151 /],
+    "Name with wildcards";
 
 search_ok { ability => 'Drizzle' },

veekun/trunk/templates/dex/lookup/wildcard.tt

@@ -7 +7 @@
 <h2>Pok&eacute;mon</h2>
 <ul>
-[%     FOREACH p IN results.pokemon.nsort %]
-<li><a href="[% dex_uri('pokemon', PokemonNames.$p) %]"><img src="/dex-images/icons/[% p.pad(3) %].png" alt=""/> [% PokemonNames.$p %]</a></li>
+[%     FOREACH match IN results.pokemon %]
+<li><a href="[% dex_uri('pokemon', match.name) %]"><img src="/dex-images/icons/[% match.id.pad(3) %].png" alt=""/> [% match.name %]</a></li>
 [%     END %]
 </ul>
+[%     IF overflow.pokemon %]
+<p> Too many Pok&eacute;mon matched to list.  Try the <a href="[% c.uri_for('/dex/pokemon/search', { name => entry }) %]">search</a> for more, or to narrow the list down. </p>
+[%     END %]
 [% END %]
 
-[% IF results.moves.size %]
+[% IF results.move.size %]
 <h2>Moves</h2>
 <ul>
-[%     FOREACH m IN results.moves.nsort %]
-<li><a href="[% dex_uri('moves', MoveData.$m.name) %]">[% MoveData.$m.name %]</a></li>
+[%     FOREACH match IN results.move %]
+<li><a href="[% dex_uri('moves', match.name) %]">[% match.name %]</a></li>
 [%     END %]
 </ul>
+[%     IF overflow.move %]
+<p> Too many moves matched to list.  Try the <a href="[% c.uri_for('/dex/moves/search', { name => entry }) %]">search</a> for more, or to narrow the list down. </p>
+[%     END %]
 [% END %]
 
-[% IF results.abilities.size %]
+[% IF results.ability.size %]
 <h2>Abilities</h2>
 <ul>
-[%     FOREACH a IN results.abilities.nsort %]
-<li><a href="[% dex_uri('abilities', AbilityNames.$a) %]">[% AbilityNames.$a %]</a></li>
+[%     FOREACH match IN results.ability %]
+<li><a href="[% dex_uri('abilities', match.name) %]">[% match.name %]</a></li>
 [%     END %]
 </ul>
+[%     IF overflow.ability %]
+<p> Too many abilities matched to list.  Try the <a href="[% c.uri_for('/dex/abilities') %]">list</a> instead? </p>
+[%     END %]
 [% END %]
 
-[% IF results.types.size %]
+[% IF results.type.size %]
 <h2>Types</h2>
 <ul>
-[%     FOREACH t IN results.types.nsort %]
-<li><a href="[% dex_uri('types', TypeNames.$t) %]">[% TypeNames.$t %]</a></li>
+[%     FOREACH match IN results.type %]
+<li><a href="[% dex_uri('types', match.name) %]">[% match.name %]</a></li>
 [%     END %]
 </ul>
+[%     IF overflow.type %]
+<p> Too many types matched to list.  Try the <a href="[% c.uri_for('/dex/types') %]">list</a> instead? </p>
+[%     END %]
 [% END %]

veekun/trunk/templates/dex/search/moves.tt

@@ -43 +43 @@
 <ul>
 [%             FOREACH m IN results %]
-<li><a href="[% dex_uri('moves', MoveData.${m.id}.name) %]">[% m.id %]: [% MoveData.${m.id}.name %]</a></li>
+<li><a href="[% dex_uri('moves', MoveData.${m.id}.name) %]">[% MoveData.${m.id}.name %]</a></li>
 [%             END %]
 </ul>