Changeset 406 for veekun/trunk/lib/Vee/Controller/Dex/Utils.pm

Timestamp:

02/08/08 02:44:39 (2 years ago)

Author:

eevee

Message:

Database refactoring. Renamed columns and tables to be more consistent and more readable. (#58)

Files:

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

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

@@ -102 +102 @@
     my @pokemon;
 
-    my (@rows, @pokemoves);
+    my (@rows, @pokemon_moves);
     # only do this if there are actually correct Pokemon to look up!
     if (@pokemon_ids) {
@@ -116 +116 @@
         
         # get moves
-        my $move_rs = $c->model('DBIC::PokeMoves')->search({
-            pokeid => [ keys %pokemon_order ],
-            method => [qw/level machine egg tutor/],
-            -nest => \ "FIND_IN_SET('$version', version)",
+        my $move_rs = $c->model('DBIC::PokemonMoves')->search({
+            pokemon_id => [ keys %pokemon_order ],
+            method     => [qw/level machine egg tutor/],
+            -nest      => \ "FIND_IN_SET('$version', versions)",
         });
         while (my $row = $move_rs->next) {
-            push @{ $pokemoves[ $_ ]{ $row->method } }, $row for @{ $pokemon_order{$row->pokeid} }
-        }
-    }
-
-    $s->{pokemon}     = \@pokemon;
-    $s->{pokemon_raw} = \@pokemon_raw;
-    $s->{pokemoves}   = \@pokemoves;
+            push @{ $pokemon_moves[ $_ ]{ $row->method } }, $row for @{ $pokemon_order{$row->pokemon_id} }
+        }
+    }
+
+    $s->{pokemon}       = \@pokemon;
+    $s->{pokemon_raw}   = \@pokemon_raw;
+    $s->{pokemon_moves} = \@pokemon_moves;
 
     $s->{template} = 'dex/utils/compare-results.tt';
@@ -173 +173 @@
     # ensure this move is actually inheritable
     # TODO: should I error if the move is learnable normally?
-    my $inheritable_ct = $c->model('DBIC::PokeMoves')->count({
-        pokeid => $pokemon->id,
-        moveid => $move->id,
-        method => [qw/ egg machine /],
-        -nest  => \ "FIND_IN_SET('$gen', version)",
+    my $inheritable_ct = $c->model('DBIC::PokemonMoves')->count({
+        pokemon_id => $pokemon->id,
+        move_id    => $move->id,
+        method     => [qw/ egg machine /],
+        -nest      => \ "FIND_IN_SET('$gen', versions)",
     });
     $c->vee_stop('', $pokemon->name, " can't inherit ", $move->name, '.') unless $inheritable_ct;
     
     my $gender_restriction;
-    if ($pokemon->gender == 255) {
+    if ($pokemon->gender_rate == 255) {
         # must also be genderless, i.e. bred with Ditto
         $gender_restriction = 255;
@@ -192 +192 @@
     ### grab the methods by which any Pokemon learn the move
 
-    my $methods_rs = $c->model('DBIC::PokeMoves')->search({
-        moveid => $move->id,
-        method => [qw[ level egg machine ]],
-        -nest => \ "FIND_IN_SET('$gen', version)",
-        'pokemon.gender' => $gender_restriction,
+    my $methods_rs = $c->model('DBIC::PokemonMoves')->search({
+        move_id => $move->id,
+        method  => [qw[ level egg machine ]],
+        -nest   => \ "FIND_IN_SET('$gen', versions)",
+        'pokemon.gender_rate' => $gender_restriction,
     }, {
         join => 'pokemon',
@@ -208 +208 @@
             $method = 'TM/HM';
         }
-        push @{ $learn_methods{ $row->pokeid } }, $method;
+        push @{ $learn_methods{ $row->pokemon_id } }, $method;
     }
 
@@ -259 +259 @@
         my %branches;
 
-        while (my $pokeid = shift @this_level) {
-            my $this_poke = $pokemon{$pokeid};
+        while (my $pokemon_id = shift @this_level) {
+            my $this_poke = $pokemon{$pokemon_id};
             my $hashref = shift @this_level;
 
-            for my $pokeid (keys %pokemon) {
-                next if not $this_poke->can_breed_with( $pokemon{$pokeid} );
-
-                if (exists $seen{ $pokeid }) {
+            for my $pokemon_id (keys %pokemon) {
+                next if not $this_poke->can_breed_with( $pokemon{$pokemon_id} );
+
+                if (exists $seen{ $pokemon_id }) {
                     # don't put anything if this Pokemon has been seen higher
                     # in the chain; needless descending is bad
-                    $hashref->{ $pokeid } = undef
-                        unless $seen{ $pokeid } < $cur_level;
+                    $hashref->{ $pokemon_id } = undef
+                        unless $seen{ $pokemon_id } < $cur_level;
                 } else {
-                    $hashref->{ $pokeid } = ( $branches{$pokeid} ||= {} );
-                    $seen{ $pokeid } = $cur_level;
+                    $hashref->{$pokemon_id} = ( $branches{$pokemon_id} ||= {} );
+                    $seen{$pokemon_id} = $cur_level;
                 }
             }