Changeset 232

Timestamp:

06/11/07 23:47:52 (3 years ago)

Author:

eevee

Message:

Inserted some DTRT magic into the flavor text/main page split; now viewing a flavor page will ensure that you get a flavor page for the next Pokemon you enter in the lookup.

Files:

• veekun/trunk/lib/Vee/Controller/Dex.pm (modified) (6 diffs)

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

@@ -101 +101 @@
     if    ($entry =~ /^tm ?(\d{1,2})$/i) { $c->res->redirect( $c->uri('Dex', 'tms', $1      ) ); return }
     elsif ($entry =~ /^hm ?(\d{1,2})$/i) { $c->res->redirect( $c->uri('Dex', 'tms', $1 + 100) ); return }
-    elsif ($entry =~ /^random(?: (pokemon|move|type))?$/i) { $c->res->redirect( $c->uri('Dex', plural($1 || 'pokemon'), 'random') ); return }
+    elsif ($entry =~ /^random(?: (pokemon|move|type))?$/i) {
+        my $url = $c->uri('Dex', plural($1 || 'pokemon'), 'random');
+        $url .= '/' . $c->session->{last_pokemon_view} if $c->session->{last_pokemon_view};
+        $c->res->redirect($url);
+        return;
+    }
 
     # the usual suspects
@@ -107 +112 @@
     my $fuzzy_value = $FuzzyMatches{ lc $entry };
     if ($fuzzy_value) {
-        $c->res->redirect( $c->uri('Dex', plural($fuzzy_value->{type}), lc $fuzzy_value->{name}) );
+        my $url = $c->uri('Dex', plural($fuzzy_value->{type}), lc $fuzzy_value->{name});
+        $url .= '/' . $c->session->{last_pokemon_view} if $c->session->{last_pokemon_view};
+        $c->res->redirect($url);
         return;
     }
@@ -123 +130 @@
         }
 
-        my $name;
+        my ($name, $suffix);
         if ($class eq 'pokemon') {
             $name = lc $PokemonNames[$result];
+            $suffix = '/' . $c->session->{last_pokemon_view} if $c->session->{last_pokemon_view};
         } elsif ($class eq 'move') {
             $name = lc $MoveData[$result]->name;
@@ -132 +140 @@
         }
 
-        $c->res->redirect( $c->uri('Dex', plural($class), $name) );
+        $c->res->redirect( $c->uri('Dex', plural($class), $name) . $suffix );
         return;
     }
@@ -386 +394 @@
     $c->vee_abort('There is no such Pokémon ', $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;
 
+    delete $c->session->{last_pokemon_view};
+
     $s->{page_title}  = $row->name . ' - Pokémon #' . $row->real_id;
     $s->{page_header} = $row->name;
@@ -716 +726 @@
     $c->vee_abort('There is no such Poké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;
 
+    $c->session->{last_pokemon_view} = 'flavor';
+
     $s->{this} = $row;
     $s->{flavors} = {