--- db/prgsrc/updatedb.pl 2000/10/19 03:28:25 1.8 +++ db/prgsrc/updatedb.pl 2000/10/22 04:44:53 1.13 @@ -22,7 +22,7 @@ The database, user and password are hard Dmitry Rubinstein -=head1 $Id: updatedb.pl,v 1.8 2000/10/19 03:28:25 boris Exp $ +=head1 $Id: updatedb.pl,v 1.13 2000/10/22 04:44:53 boris Exp $ =cut @@ -33,12 +33,12 @@ my (%RevMonths) = 'JAN', '1', 'FEB', '2', 'MAR', '3', 'APR', '4', 'MAY', '5', 'JUN', '6', 'JUL', '7', 'AUG', '8', 'SEP', '9', 'OCT', '10', 'NOV', '11', 'DEC', '12', - 'Янв', '0', 'Фев', 1, 'Мар', 2, 'Апр', 3, 'Май', '4', - 'Июн', '5', 'Июл', 6, 'Авг', '7', 'Сен', '8', - 'Окт', '9', 'Ноя', '19', 'Дек', '11'); + 'Янв', '1', 'Фев', '2', 'Мар', '3', 'Апр', '4', 'Май', '5', + 'Июн', '6', 'Июл', '7', 'Авг', '8', 'Сен', '9', + 'Окт', '10', 'Ноя', '11', 'Дек', '12'); my ($sth); -use vars qw($/); + @@ -64,13 +64,13 @@ sub getField { my($key); my($value) = (''); while (<$desc>) { - s/ //; + s/[ ]//g; if ($key && /^\s*$/) { chomp $value; chomp $key; if ($key eq 'Дата') { $value =~ s/^(.*)-(.*)-(.*)$/$3-$2-$1/; - my($month) = $RevMonths{$2}; + my($month) = $RevMonths{$2} || '000'; $value =~ s/$2/$month/; } $value = $dbh->quote($value); @@ -78,8 +78,9 @@ sub getField { } next if (/^\s*$/); - if (/^(.*)[:\.]\s*$/ && !$key) { + if (s/^(.*?)[:\.]\s*// && !$key) { $key = $1; + $value=$_; next; } if ($key) { @@ -139,7 +140,7 @@ sub UpdateQuestion { } sub CheckFile { - my ($dbh, $source,$title) = @_; + my ($dbh, $source, $title) = @_; my $sth = $dbh->prepare("SELECT Id,ParentId,QuestionsNum FROM Tournaments WHERE FileName=$source AND Type='Ч'"); $sth->execute or die $dbh->errstr; @@ -148,14 +149,14 @@ sub CheckFile { return SelectGroup($dbh,$source,$title); } my($Id,$ParentId,$QuestionsNum)=@arr; - if($QuestionsNum) { + if($QuestionsNum) { print "Файл $source с данными $title уже существует. ", "Заменить?[y/N]\n"; my $answer = ; if ($answer !~ /^[yY]/) { return (0,0); } else { - DeleteTournament($dbh,$Id,0); + DeleteTournament($dbh,$Id,$ParentId,$QuestionsNum,0); } } return($Id,$ParentId); @@ -163,10 +164,13 @@ sub CheckFile { sub DeleteTournament { - my ($dbh,$Id,$DeleteMyself) = @_; + my ($dbh,$Id,$ParentId,$QuestionsNum,$DeleteMyself) = @_; + if ($QuestionsNum) { + UpdateParents($dbh,$ParentId,-$QuestionsNum); + } my (@Tours) = &GetTours($dbh, $Id); foreach my $Tour (@Tours) { - DeleteTournament($dbh,$Tour,1); + DeleteTournament($dbh,$Tour,$Id,0,1); } my $sth = $dbh->prepare("DELETE FROM Questions WHERE ParentId=$Id"); @@ -174,6 +178,7 @@ sub DeleteTournament { if($DeleteMyself) { $sth = $dbh->prepare("DELETE FROM Tournaments WHERE Id=$Id"); + $sth->execute or die $dbh->errstr; } } @@ -193,11 +198,39 @@ sub GetTours { return @Tours; } +sub CreateTour { + my ($dbh,$title,$ParentId,$rh_defaults)=@_; + my $sth = $dbh->prepare("INSERT INTO Tournaments + (Title, Type, ParentId) + VALUES ($title, 'Т', $ParentId)"); + $sth->execute; + my $TourId = $sth->{mysql_insertid}; + while (my ($key,$value)=each %$rh_defaults) { + &UpdateTournament($dbh, $TourId, $key, $value); + } + return $TourId; +} + MAIN: { my($key, $value, $addition); - + # + # Inherited fields for a Tour or Tournament + # + my %TourFields = ('Копирайт' => 'Copyright', + 'Инфо' => 'Info', 'URL' => 'URL', + 'Ссылка' => 'URL', 'Редактор' => 'Editors', + 'Обработан'=> 'EnteredBy', + 'Дата'=>'PlayedAt'); + # + # Inherited fields for a Question + # + my %QuestionFields = ('Тип'=> 'Type', 'Вид'=> 'Type', + 'Автор' => 'Authors', + 'Источник' => 'Source'); + + my($source); my($dbh) = DBI->connect("DBI:mysql:chgk", "piataev", "") @@ -218,20 +251,22 @@ MAIN: $source =~ s/^.*\/([^\/]*)$/$1/; $source = $dbh->quote($source); print STDERR "Файл: $source, дата: $CreatedAt "; - + my %TourDefaults=('CreatedAt'=>$CreatedAt); + my %QuestionDefaults=(); + my %QuestionGlobalDefaults=(); while (($key, $value) = getField(\*INFD, $dbh)) { last if (!$key); if ($key =~ /Мета/) { next; # This is obsolete } - if ($key =~ /Чемпионат/ || $key =~ /Пакет/) { + if ($key =~ /Чемпионат/ || $key =~ /Пакет/) { ($TournamentId, $ParentId) = CheckFile($dbh,$source,$value); if (!$TournamentId) { last; - } + } $sth = $dbh->prepare("UPDATE Tournaments SET - Title=$value, Type='Ч', + Title=$value, Type='Ч', ParentId=$ParentId, FileName=$source, CreatedAt=$CreatedAt @@ -246,21 +281,18 @@ MAIN: WHERE Id=$TourId"); } $qnum = 0; - $qtype = 'Ч'; - $sth = $dbh->prepare("INSERT INTO Tournaments - (Title, Type, ParentId, CreatedAt) - VALUES ($value, 'Т', $TournamentId, - $CreatedAt)"); - $sth->execute; - $TourId = $sth->{mysql_insertid}; - next; - } - if ($key =~ /Вид/ || $key =~ /Тип/) { - $qtype = $value; - $qtype =~ s/\'//g; - next; + $TourId=CreateTour($dbh,$value,$TournamentId,\%TourDefaults); + %QuestionDefaults=%QuestionGlobalDefaults; + $QuestionId=0; + next; } if ($key =~ /Вопрос/) { + if (!$TourId) { + $qnum = 0; + $TourId=CreateTour($dbh,'1',$TournamentId, + \%TourDefaults); + %QuestionDefaults=%QuestionGlobalDefaults; + } my $query = "INSERT INTO Questions (ParentId, Number, Type) VALUES ($TourId, $qnum+1, \'$qtype\')"; @@ -268,6 +300,9 @@ MAIN: $sth->execute or print $query;; $QuestionId = $sth->{mysql_insertid}; &UpdateQuestion($dbh, $QuestionId, "Question", $value); + while (my ($key,$value)=each %QuestionDefaults) { + &UpdateQuestion($dbh, $QuestionId, $key, $value); + } $qnum++; $all_qnum++; next; @@ -278,67 +313,43 @@ MAIN: next; } - if ($key =~ /Рейтинг/) { - &UpdateQuestion($dbh, $QuestionId, "Rating", $value); - next; - } - - - if ($key =~ /Автор/) { - &UpdateQuestion($dbh, $QuestionId, "Authors", $value); - next; - } - - - if ($key =~ /Источник/) { - &UpdateQuestion($dbh, $QuestionId, "Sources", $value); - next; - } - - if ($key =~ /Комментари/) { &UpdateQuestion($dbh, $QuestionId, "Comments", $value); next; } + my @Fields = grep /$key/, keys %QuestionFields; - if ($key =~ /URL/ || $key =~ /Ссылка/) { - &UpdateTournament($dbh, $TournamentId, "URL", $value); - next; - } - - - if ($key =~ /Копирайт/) { - &UpdateTournament($dbh, $TournamentId, "Copyright", $value); - next; - } - - - if ($key =~ /Инфо/) { - &UpdateTournament($dbh, $TournamentId, "Info", $value); + if (scalar @Fields) { + my $word = shift @Fields; + my $field = $QuestionFields{$word}; + if ($QuestionId) { + &UpdateQuestion($dbh, $QuestionId, $field, $value); + } elsif ($TourId) { + $QuestionDefaults{$field}=$value; + } else { + $QuestionGlobalDefaults{$field}=$value; + } next; } - - if ($key =~ /Редактор/) { - &UpdateTournament($dbh, $TournamentId, "Editors", $value); - next; - } - + @Fields = grep /$key/, keys %TourFields; - if ($key =~ /Обработан/) { - &UpdateTournament($dbh, $TournamentId, "EnteredBy", $value); - next; - } - - if ($key =~ /Дата/) { - if ($TourId) { - &UpdateTournament($dbh, $TourId, "PlayedAt", $value); + if (scalar @Fields) { + my $word = shift @Fields; + my $field = $TourFields{$word}; + if ($QuestionId) { + print STDERR "ОШИБКА: $key $value недопустимы после", + " начала вопросов\n"; + } elsif ($TourId) { + &UpdateTournament($dbh, $TourId, $field, $value); } else { - &UpdateTournament($dbh, $TournamentId, "PlayedAt", $value); + &UpdateTournament($dbh, $TournamentId, $field, $value); + $TourDefaults{$field}=$value; } next; } + # # If we are here, something got wrong!