Changeset 393 for veekun/trunk/lib/Vee/Schema

Timestamp:

12/29/07 21:29:06 (2 years ago)

Author:

eevee

Message:

Locations mini-commit.
- Redid location pages to match the new format.
- Removed incorrect header text from Pokemon pages.
- Fixed up EncounterSet?->simplest_method to return more display-friendly data (thus merging together buckets with the same rarity), and corrected the old documentation. Also removed old inaccessible code.
- Refactored sections into their own database table.
- Refactored method-cell code into its own macro.

Location:

veekun/trunk/lib/Vee/Schema

Files:

• LocationEncounters.pm (modified) (2 diffs)
• LocationSections.pm (added)
• Locations.pm (modified) (1 diff)
• Pokemon.pm (modified) (1 diff)

veekun/trunk/lib/Vee/Schema/LocationEncounters.pm

@@ -13 +13 @@
 __PACKAGE__->load_components('Core');
 __PACKAGE__->table('location_encounters');
-__PACKAGE__->add_columns(qw/ location_id rarity version section pokemon_id method min_level max_level /);
-__PACKAGE__->set_primary_key(qw/ location_id rarity /);
+__PACKAGE__->add_columns(qw/ section_id rarity version pokemon_id method min_level max_level /);
+__PACKAGE__->set_primary_key(qw/ section_id rarity /);
 
 __PACKAGE__->belongs_to(pokemon => 'Vee::Schema::Pokemon', 'pokemon_id');
-__PACKAGE__->belongs_to(location => 'Vee::Schema::Locations', 'location_id');
+__PACKAGE__->belongs_to(section => 'Vee::Schema::LocationSections', 'section_id');
 
 =head1 METHODS
@@ -30 +30 @@
 sub level {
     my ($self) = @_;
-    
+
     my $level;
     my ($min, $max) = ($self->min_level, $self->max_level);

veekun/trunk/lib/Vee/Schema/Locations.pm

@@ -16 +16 @@
 __PACKAGE__->set_primary_key('id');
 
-__PACKAGE__->has_many(encounters => 'Vee::Schema::LocationEncounters', 'location_id');
+__PACKAGE__->has_many(sections => 'Vee::Schema::LocationSections', 'location_id');
 
 =head1 SEE ALSO

veekun/trunk/lib/Vee/Schema/Pokemon.pm

@@ -162 +162 @@
     my @encounter_sets;
 
-    my $sections_rs = $self->encounters_rs( undef, {
-        group_by => 'location_id, section',
+    my $grouped_sections_rs = $self->encounters_rs( undef, {
+        group_by => 'section_id',
     } );
 
-    while (my $section = $sections_rs->next) {
-        my $encounters_rs = $section->location->encounters_rs( {
+    while (my $enc_section = $grouped_sections_rs->next) {
+        my $encounters_rs = $enc_section->section->encounters_rs( {
             version     => 'diamond',
-            section     => $section->section,
+            section_id  => $enc_section->section->id,
         } );