Changeset 11302

Timestamp:

05/09/08 21:40:47 (5 years ago)

Author:

lopnor

Message:

websites/jwatch.jp: start to make htmls.

Location:

websites/jwatch.jp/trunk

Files:

• lib/JWatch.pm (modified) (1 diff)
• lib/JWatch/Controller/Root.pm (modified) (2 diffs)
• lib/JWatch/Schema (added)
• lib/JWatch/Schema.pm (modified) (1 diff)
• lib/JWatch/Schema/Club.pm (added)
• lib/JWatch/Schema/Event.pm (added)
• lib/JWatch/Schema/Game.pm (added)
• lib/JWatch/Schema/GameOfficial.pm (added)
• lib/JWatch/Schema/GamePlayer.pm (added)
• lib/JWatch/Schema/Official.pm (added)
• lib/JWatch/Schema/Player.pm (added)
• lib/JWatch/Schema/Stadium.pm (added)
• lib/JWatch/View/TT.pm (added)
• misc/jwatch_create.sql (modified) (7 diffs)
• misc/jwatch_fixdata.sql (modified) (2 diffs)
• misc/load_club_player_from_j.pl (modified) (1 diff)
• misc/load_game_from_jsgoal.pl (modified) (3 diffs)
• misc/load_official_from_j.pl (modified) (1 diff)
• misc/load_schedule_from_jsgoal.pl (modified) (2 diffs)
• misc/load_stadium_from_jsgoal.pl (modified) (1 diff)
• misc/update_game_from_jsgoal.pl (added)
• misc/update_player_from_j.pl (modified) (1 diff)
• root/lib (added)
• root/lib/config (added)
• root/lib/config/col (added)
• root/lib/config/main (added)
• root/lib/config/url (added)
• root/lib/site (added)
• root/lib/site/footer (added)
• root/lib/site/header (added)
• root/lib/site/html (added)
• root/lib/site/layout (added)
• root/lib/site/wrapper (added)
• root/src (added)
• root/src/error.tt2 (added)
• root/src/index.tt2 (added)
• root/src/message.tt2 (added)
• root/src/ttsite.css (added)
• root/src/welcome.tt2 (added)

websites/jwatch.jp/trunk/lib/JWatch.pm

@@ -14 +14 @@
 #                 directory
 
-use Catalyst qw/-Debug ConfigLoader Static::Simple/;
+use Catalyst qw/
+    -Debug 
+    ConfigLoader 
+    Static::Simple
+    
+    Unicode
+    /;
 
 our $VERSION = '0.01';

websites/jwatch.jp/trunk/lib/JWatch/Controller/Root.pm

@@ -3 +3 @@
 use strict;
 use warnings;
+use utf8;
 use base 'Catalyst::Controller';
 
@@ -34 +35 @@
 }
 
+sub index : Private {
+    my ( $self, $c ) = @_;
+
+    my @list = $c->model('DBIC')->resultset('Event')->search(
+        {},
+        { 
+            rows => 40, 
+            order_by => 'datetime desc',
+            join => 'game',
+        }
+    );
+    for my $event (@list) {
+        my $game = $event->game;
+        my @score= $c->model('DBIC')->resultset('Event')->search(
+            {
+                gameid => $event->gameid,
+                gametime => { '<=' => $event->gametime },
+                type => 'goal',
+            }, 
+            {
+                select => [
+                    { count => 'clubid' },
+                    'clubid',
+                ],
+                as => [qw(score clubid)],
+                group_by => 'clubid',
+            }
+        );
+        my %score = map {( $_->clubid, $_->get_column('score') )} @score;
+        $event->{gamedesc} = join (' ',
+            $game->homeclub->shortname,
+            $score{$game->clubid_home} || '0',
+            '-',
+            $score{$game->clubid_away} || '0',
+            $game->awayclub->shortname,
+        );
+        $event->{referee} = $game->officials({type => 'referee'})->next;
+        $event->{referee}->{shortname} = (split('　', $event->{referee}->name))[0];
+        for my $player (qw(player1 player2)) {
+            $event->$player or next;
+            my $name = $c->model('DBIC')->resultset('Player')->find(
+                {
+                    year => $game->kickoff->year,
+                    clubid => $event->clubid,
+                    number => $event->$player,
+                },{
+                    order_by => 'serialno desc',
+                    rows => 1,
+                }
+            )->name;
+            $event->{$player.'name'} = join ('',
+                '#',$event->$player,
+                (split('　', $name))[0]
+            );
+        }
+    }
+    $c->stash->{eventlist} = \@list;
+    $c->stash->{template} = 'index.tt2';
+
+}
+
 =head2 end
 

websites/jwatch.jp/trunk/lib/JWatch/Schema.pm

@@ -2 +2 @@
 
 use strict;
-use base qw/DBIx::Class::Schema::Loader/;
+use warnings;
 
-__PACKAGE__->loader_options(
-    relationships => 1,
-    # debug => 1,
-    components => [qw(
-        InflateColumn::DateTime
-    )],
-);
+use base 'DBIx::Class::Schema';
 
-=head1 NAME
+__PACKAGE__->load_classes;
 
-JWatch::Schema - DBIx::Class::Schema::Loader class
 
-=head1 SYNOPSIS
+# Created by DBIx::Class::Schema::Loader v0.04004 @ 2008-05-09 19:54:05
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:OgmUik4aXXMY1Ed5TMMoKw
 
-See L<JWatch>
 
-=head1 DESCRIPTION
-
-Generated by L<Catalyst::Model::DBIC::Schema> for use in L<JWatch::Model::DBIC>
-
-=head1 AUTHOR
-
-A clever guy
-
-=head1 LICENSE
-
-This library is free software, you can redistribute it and/or modify
-it under the same terms as Perl itself.
-
-=cut
-
+# You can replace this text with custom content, and it will be preserved on regeneration
 1;
-

websites/jwatch.jp/trunk/misc/jwatch_create.sql

@@ -1 +1 @@
 -- vim: ft=mysql
 DROP DATABASE IF EXISTS jwatch;
-CREATE DATABASE jwatch;
+CREATE DATABASE jwatch default character set utf8;
 
 use jwatch;
 create table `club` (
-    clubid int not null default 0 primary key,
+    id int not null default 0 primary key,
     shortname tinytext,
     name tinytext,
@@ -25 +25 @@
 
 create table `official` (
-    officialid tinyint not null auto_increment primary key,
+    id tinyint not null auto_increment primary key,
     name tinytext,
     name_i18n tinytext
@@ -31 +31 @@
 
 create table `stadium` (
-    stadiumid int not null primary key,
+    id int not null primary key,
     name tinytext,
     name_i18n tinytext
@@ -37 +37 @@
 
 create table `game` (
-    gameid decimal(20) not null default 0 primary key,
+    id char(20) not null default '' primary key,
     category tinyint,
     gameno tinyint,
@@ -44 +44 @@
     clubid_away int,
     stadiumid int,
-    score_home tinyint,
-    score_away tinyint
+    score_home tinyint default null,
+    score_away tinyint default null
 );
 
 create table `game_player` (
-    `gameid` decimal(20) not null default 0,
+    `gameid` char(20) not null default '',
     `clubid` int not null default 0,
     `number` tinyint not null default 0,
@@ -60 +60 @@
 
 create table `game_official` (
-    gameid decimal(20) not null default 0,
+    gameid char(20) not null default '',
     officialid tinyint not null default 0,
     `type` enum('referee', 'assistant', 'fourth'),
@@ -67 +67 @@
 
 create table event (
-    `eventid` int not null auto_increment primary key,
-    `gameid` decimal(20) not null default 0,
+    `id` int not null auto_increment primary key,
+    `gameid` char(20) not null default '',
     `gametime` tinyint not null default 0,
     `datetime` datetime,
-    `type` enum('goal', 'yellow', 'red', 'change', 'other'),
+    `type` enum('goal', 'yellow', 'red', 'change', 'other', 'member', 'end'),
     `clubid` int,
     `player1` tinyint,

websites/jwatch.jp/trunk/misc/jwatch_fixdata.sql

@@ +1 @@
+use jwatch;
 update player set
     name = '森崎　浩司'
@@ -20 +21 @@
     name = '高地　系治'
     where clubid = 44 and year = 2008 and number = 6;
+update player set
+    name = '楢崎　正剛'
+    where clubid = 8 and year = 2008 and number = 1;

websites/jwatch.jp/trunk/misc/load_club_player_from_j.pl

@@ -71 +71 @@
             my $res = $scraper->scrape(URI->new($memberurl));
             return {
-                clubid => int $clubid,
+                id => int $clubid,
                 category => int $category,
                 shortname => $shortname,

websites/jwatch.jp/trunk/misc/load_game_from_jsgoal.pl

@@ -34 +34 @@
 for ($games->search({kickoff => {'<' => DateTime->now}})) {
     $game = $_;
-    $gameid = $game->gameid;
+    $gameid = $game->id;
     $kickoff = $game->kickoff;
     my $uri = URI->new(
@@ -128 +128 @@
     }
     if ($player1 eq 'オウンゴ−ル') {
-        $description = $player1;
+        $description = 'own goal';
         $player1 = '';
     } else {
@@ -149 +149 @@
     my @cell = $_->look_down(_tag => 'td');
     $type = ($cell[0]->as_text eq '主審') ? 'referee' : 'assistant';
-    my $officialid = $officials->find({name => $cell[-1]->as_text})->officialid;
+    my $officialid = $officials->find({name => $cell[-1]->as_text})->id;
     return {
         gameid => $gameid,

websites/jwatch.jp/trunk/misc/load_official_from_j.pl

@@ -31 +31 @@
             $name_i18n eq 'Name' and return;
             return {
-                officialid => ++$officialid,
+                id => ++$officialid,
                 name => $cell[1]->as_trimmed_text,
                 name_i18n => $name_i18n,

websites/jwatch.jp/trunk/misc/load_schedule_from_jsgoal.pl

@@ -62 +62 @@
         $strp->parse_datetime($kickoff)
     );
-    my $clubid_home = $clubs->find({shortname => $cell[1]->as_text})->clubid;
-    my $clubid_away = $clubs->find({shortname => $cell[3]->as_text})->clubid;
+    my $clubid_home = $clubs->find({shortname => $cell[1]->as_text})->id;
+    my $clubid_away = $clubs->find({shortname => $cell[3]->as_text})->id;
     my $stadiumlink = $cell[4]->look_down(_tag => 'a');
     my $stadiumid = URI->new($stadiumlink->attr('href'))->query_param('s') if $stadiumlink;
     return {
-        gameid => $gameid || '',
+        id => $gameid || '',
         category => $category,
         gameno => $gameno,
@@ -74 +74 @@
         clubid_away => $clubid_away,
         stadiumid => $stadiumid || 0,
-        score_home => $score_home || 0,
-        score_away => $score_away || 0,
+        score_home => defined $score_home ? $score_home : undef,
+        score_away => defined $score_away ? $score_away : undef,
     };
 }

websites/jwatch.jp/trunk/misc/load_stadium_from_jsgoal.pl

@@ -26 +26 @@
         my $stadiumid = URI->new($a->attr('href'))->query_param('s');
         return {
-            stadiumid => int $stadiumid,
+            id => int $stadiumid,
             name => $a->as_trimmed_text,
         };

websites/jwatch.jp/trunk/misc/update_player_from_j.pl

@@ -25 +25 @@
 for my $info (reverse @infolist) {
     my $date = delete $info->{date};
-    my $clubid = $schema->resultset('Club')->find({name => $info->{clubname}})->clubid;
+    my $clubid = $schema->resultset('Club')->find({name => $info->{clubname}})->id;
     my $name;
     my $player = $schema->resultset('Player')->find(