--- db/prgsrc/updatedb.pl 2000/10/20 00:39:27 1.9 +++ db/prgsrc/updatedb.pl 2002/01/12 00:55:33 1.22 @@ -22,7 +22,7 @@ The database, user and password are hard Dmitry Rubinstein -=head1 $Id: updatedb.pl,v 1.9 2000/10/20 00:39:27 boris Exp $ +=head1 $Id: updatedb.pl,v 1.22 2002/01/12 00:55:33 roma7 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,22 +64,24 @@ 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} || '000'; - $value =~ s/$2/$month/; + my($month) = $RevMonths{$2} || '01'; + $value =~ s/-(.*)-/-$month-/; + $value =~ s/-00*$/-01/; } $value = $dbh->quote($value); return ($key, $value); } next if (/^\s*$/); - if (/^(.*)[:\.]\s*$/ && !$key) { + if (!$key && /^(.*?)[:\.]\s*(.*)$/s) { $key = $1; + $value=$2; next; } if ($key) { @@ -133,13 +135,14 @@ sub UpdateTournament { sub UpdateQuestion { my ($dbh, $QuestionId, $field, $value) = @_; + $value=~s/\s*$//; $dbh->do("UPDATE Questions SET $field=$value WHERE QuestionId=$QuestionId") or die $dbh->errstr; } 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 +151,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 +166,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"); @@ -194,20 +200,50 @@ sub GetTours { return @Tours; } +sub CreateTour { + my ($dbh,$title,$ParentId,$TourNum,$rh_defaults)=@_; + my $sth = $dbh->prepare("INSERT INTO Tournaments + (Title, Type, ParentId, Number) + VALUES ($title, 'Т', $ParentId, $TourNum)"); + $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', 'Рейтинг'=>'Rating', + 'Источник' => 'Sources', + 'Тема' => 'Topic'); + + my($source); my($dbh) = DBI->connect("DBI:mysql:chgk", "piataev", "") or die "Can't connect to DB chgk\n"; while ($source = shift) { + my $TourNum=0; my($PlayedAt) = ''; my($QuestionId, $TourId, $TournamentId, $ParentId) = (0, 0, 0, 0); - my($tournum, $qnum, $all_qnum, $qtype) = (0, 0, 0, 'Ч'); + my($tournum, $qnum, $all_qnum) = (0, 0, 0); my (@d) = (localtime((stat($source))[9]))[5,4,3]; $d[1]++; $d[0]+=1900; @@ -219,20 +255,22 @@ MAIN: $source =~ s/^.*\/([^\/]*)$/$1/; $source = $dbh->quote($source); print STDERR "Файл: $source, дата: $CreatedAt "; - + my %TourDefaults=('CreatedAt'=>$CreatedAt); + my %QuestionDefaults=(); + my %QuestionGlobalDefaults=('Type'=>$dbh->quote('Ч')); 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 @@ -247,28 +285,31 @@ 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; + $TourNum++; + $TourId=CreateTour($dbh,$value,$TournamentId,$TourNum, + \%TourDefaults); + %QuestionDefaults=%QuestionGlobalDefaults; + $QuestionId=0; + next; } if ($key =~ /Вопрос/) { + if (!$TourId) { + $qnum = 0; + $TourNum++; + $TourId=CreateTour($dbh,'1',$TournamentId,$TourNum, + \%TourDefaults); + %QuestionDefaults=%QuestionGlobalDefaults; + } my $query = "INSERT INTO Questions - (ParentId, Number, Type) - VALUES ($TourId, $qnum+1, \'$qtype\')"; + (ParentId, Number) + VALUES ($TourId, $qnum+1)"; $sth = $dbh->prepare($query); $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; @@ -279,67 +320,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!