--- db/prgsrc/updatedb.pl 2009/05/21 11:33:26 1.45 +++ db/prgsrc/updatedb.pl 2009/05/24 10:10:17 1.46 @@ -28,7 +28,7 @@ The database, user and password are hard Dmitry Rubinstein -=head1 $Id: updatedb.pl,v 1.45 2009/05/21 11:33:26 roma7 Exp $ +=head1 $Id: updatedb.pl,v 1.46 2009/05/24 10:10:17 roma7 Exp $ =cut @@ -59,60 +59,74 @@ my ($sth); use DBI; use strict; +use Data::Dumper; my $isunsorted=0; sub UpdateParents { my ($dbh, $ParentId, $all_qnum,$CreatedAt) = @_; if ($ParentId) { - my ($sth1) = $dbh->prepare("SELECT QuestionsNum, ParentId, CreatedAt + my ($sth1) = $dbh->prepare("SELECT QuestionsNum, ParentId, CreatedAt FROM Tournaments WHERE Id = $ParentId"); - $sth1->execute; - my ($q, $p,$c) = ($sth1->fetchrow)[0, 1, 2]; - $c=$CreatedAt if $CreatedAt && ($CreatedAt gt $c); - my $qc=$dbh->quote($c); - $dbh->do("UPDATE Tournaments SET + $sth1->execute; + my ($q, $p,$c) = ($sth1->fetchrow)[0, 1, 2]; + $c=$CreatedAt if $CreatedAt && ($CreatedAt gt $c); + my $qc=$dbh->quote($c); + $dbh->do("UPDATE Tournaments SET QuestionsNum=$q + $all_qnum, CreatedAt=$qc WHERE Id = $ParentId"); - &UpdateParents($dbh, $p, $all_qnum,$c); + &UpdateParents($dbh, $p, $all_qnum,$c); } } +sub parseDate { + my $value = shift; + my ($from, $to) = split /\s+\-+\s+/, $value; + $from =~ s/^(.*)-(.*)-(.*)$/$3-$2-$1/; + my($month) = $RevMonths{$2} || '01'; + $from =~ s/-(.*)-/-$month-/; + $from =~ s/-00*$/-01/; + if ($to) { + $to =~ s/^(.*)-(.*)-(.*)$/$3-$2-$1/; + $month = $RevMonths{$2} || '01'; + $to =~ s/-(.*)-/-$month-/; + $to =~ s/-00*$/-01/; + } + return ($from, $to); + +} sub getField { my($desc, $dbh) = @_; my($key); my($value) = (''); while (<$desc>) { - s/[ ]//g; - if ($key && /^\s*$/) { - chomp $value; + s/[ +]//g; + if ($key && /^\s*$/) { + chomp $value; $value =~ s/\s+$//; - chomp $key; - if ($key eq 'Дата') { - $value =~ s/^(.*)-(.*)-(.*)$/$3-$2-$1/; - my($month) = $RevMonths{$2} || '01'; - $value =~ s/-(.*)-/-$month-/; - $value =~ s/-00*$/-01/; - } - if ($key eq 'Автор') {$value=~s/\.$//;} - $value = $dbh->quote($value); - return ($key, $value); - } - next if (/^\s*$/); - - if (!$key && /^(.*?)[:\.]\s*(.*)$/s) { - $key = $1; - $value=$2; - next; - } - if ($key) { - $value .= $_; - next; - } + chomp $key; + if ($key eq 'Дата') { + my ($from, $to) = parseDate($value); + $value = {'PlayedAt'=>$from, 'PlayedAt2'=>$to}; + } + if ($key eq 'Автор') {$value=~s/\.$//;} + return ($key, $value); + } + next if (/^\s*$/); + + if (!$key && /^(.*?)[:\.]\s*(.*)$/s) { + $key = $1; + $value=$2; + next; + } + if ($key) { + $value .= $_."\n"; + next; + } } if ($key && $value) { - $value=~s/\s+$//; - $value = $dbh->quote($value); - return ($key, $value); + $value=~s/\s+$//sm; + return ($key, $value); } return (0, 0); } @@ -122,140 +136,151 @@ sub SelectGroup { my ($sth, $ParentId, $i, @arr); if ($Interactive) { - $sth = $dbh->prepare("SELECT Id, Title FROM - Tournaments WHERE Type = 'Г'"); - $sth->execute; - print "Выберите группу для турнира:\n$TourName, файл $source\n\n"; - while (@arr=$sth->fetchrow) { - print "[$arr[0]] $arr[1]\n"; - } - $ParentId = ; - chomp $ParentId; - if (!$ParentId) { - print "Пропускаем файл $source\n"; - print STDERR "Файл $source отвергнут оператором\n"; - return (0,0); - } else { - print "Вы выбрали турнир: $ParentId\n"; - $sth = $dbh->prepare("INSERT INTO Tournaments - (Title, Type, ParentId, FileName) - VALUES ($TourName, 'Ч', $ParentId, + $sth = $dbh->prepare("SELECT Id, Title FROM + Tournaments WHERE Type = 'Г'"); + $sth->execute; + print "Выберите группу для турнира:\n$TourName, файл $source\n\n"; + while (@arr=$sth->fetchrow) { + print "[$arr[0]] $arr[1]\n"; + } + $ParentId = ; + chomp $ParentId; + if (!$ParentId) { + print "Пропускаем файл $source\n"; + print STDERR "Файл $source отвергнут оператором\n"; + return (0,0); + } else { + print "Вы выбрали турнир: $ParentId\n"; + $sth = $dbh->prepare("INSERT INTO Tournaments + (Title, Type, ParentId, FileName) + VALUES ($TourName, 'Ч', $ParentId, $source)"); - $sth->execute; - my $TournamentId = $sth->{mysql_insertid}; - return ($TournamentId,$ParentId); - } + $sth->execute; + my $TournamentId = $sth->{mysql_insertid}; + return ($TournamentId,$ParentId); + } } else { # Теперь, если файла нет в дереве турниров, никаких вопросов не # задаётся, а вместо этого он добавляется в группу 9999 - $ParentId = 9999; - my $tempsource=$source; - my $temptname=$TourName; + $ParentId = 9999; + my $tempsource=$source; + my $temptname=$TourName; $tempsource=~s/^\'(.*)\'$/$1/; $temptname=~s/^\'(.*)\'$/$1/; - print UNSORTED "$tempsource".((12 -length($source))x' ')."\t$temptname\n"; - $isunsorted=1; - $sth = $dbh->prepare("INSERT INTO Tournaments - (Title, Type, ParentId, FileName,CreatedAt) - VALUES ($TourName, 'Ч', $ParentId, + print UNSORTED "$tempsource".((12 -length($source))x' ')."\t$temptname\n"; + $isunsorted=1; + $sth = $dbh->prepare("INSERT INTO Tournaments + (Title, Type, ParentId, FileName,CreatedAt) + VALUES (".$dbh->quote($TourName).", 'Ч', $ParentId, $source,NOW())"); $sth->execute; - my $TournamentId = $sth->{mysql_insertid}; - return ($TournamentId,$ParentId); - } - + my $TournamentId = $sth->{mysql_insertid}; + return ($TournamentId,$ParentId); + } + } sub UpdateTournament { my ($dbh, $TournamentId, $field, $value) = @_; - $dbh->do("UPDATE Tournaments SET $field=$value WHERE Id=$TournamentId") - or die $dbh->errstr; + if (ref $value eq 'HASH') { + # It means that $value contains information about several fields + foreach my $k(keys %$value) { + if ($value->{$k}) { + &UpdateTournament($dbh, $TournamentId, $k, $value->{$k}); + } + } + } else { + my $v = $dbh->quote($value); + $dbh->do("UPDATE Tournaments SET $field=$v WHERE Id=$TournamentId") + or die $dbh->errstr; + } } sub UpdateQuestion { my ($dbh, $QuestionId, $field, $value) = @_; - if (($field eq 'Type') && ($value eq "'Д'")) { - $value = "'ЧД'"; + if (($field eq 'Type') && ($value eq "Д")) { + $value = "ЧД"; } - $dbh->do("UPDATE Questions SET $field=$value - WHERE QuestionId=$QuestionId") - or die $dbh->errstr; + my $v = $dbh->quote($value); + $dbh->do("UPDATE Questions SET $field=$v + WHERE QuestionId=$QuestionId") + or die $dbh->errstr; } sub CheckFile { 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; + WHERE FileName=? AND Type='Ч'"); + $sth->execute($source) or die $dbh->errstr; my @arr = $sth->fetchrow; if (! scalar @arr) { - return SelectGroup($dbh,$source,$title); + return SelectGroup($dbh,$source,$title); } my($Id,$ParentId,$QuestionsNum)=@arr; - if($QuestionsNum) { - print "Файл $source с данными $title уже существует. ", - "Заменить?[y/N]\n"; - my $answer = ; - if ($answer !~ /^[yY]/) { - return (0,0); - } else { - DeleteTournament($dbh,$Id,$ParentId,$QuestionsNum,0); - } + if($QuestionsNum) { + print "Файл $source с данными $title уже существует. ", + "Заменить?[y/N]\n"; + my $answer = ; + if ($answer !~ /^[yY]/) { + return (0,0); + } else { + DeleteTournament($dbh,$Id,$ParentId,$QuestionsNum,0); + } } - return($Id,$ParentId); + return($Id,$ParentId); } sub DeleteTournament { my ($dbh,$Id,$ParentId,$QuestionsNum,$DeleteMyself) = @_; if ($QuestionsNum) { - UpdateParents($dbh,$ParentId,-$QuestionsNum); + UpdateParents($dbh,$ParentId,-$QuestionsNum); } my (@Tours) = &GetTours($dbh, $Id); foreach my $Tour (@Tours) { - DeleteTournament($dbh,$Tour,$Id,0,1); + DeleteTournament($dbh,$Tour,$Id,0,1); } my $sth = $dbh->prepare("DELETE FROM Questions WHERE ParentId=$Id"); $sth->execute or die $dbh->errstr; if($DeleteMyself) { - $sth = $dbh->prepare("DELETE FROM Tournaments + $sth = $dbh->prepare("DELETE FROM Tournaments WHERE Id=$Id"); - $sth->execute or die $dbh->errstr; + $sth->execute or die $dbh->errstr; } } sub GetTours { - my ($dbh, $ParentId) = @_; - my (@arr, @Tours); + my ($dbh, $ParentId) = @_; + my (@arr, @Tours); - my ($sth) = $dbh->prepare("SELECT Id FROM Tournaments - WHERE ParentId=$ParentId ORDER BY Id"); + my ($sth) = $dbh->prepare("SELECT Id FROM Tournaments + WHERE ParentId=$ParentId ORDER BY Id"); - $sth->execute; + $sth->execute; - while (@arr = $sth->fetchrow) { - push @Tours, $arr[0]; - } + while (@arr = $sth->fetchrow) { + push @Tours, $arr[0]; + } - return @Tours; + return @Tours; } sub CreateTour { - my ($dbh,$title,$ParentId,$TourNum,$rh_defaults)=@_; + my ($dbh,$title,$ParentId,$TourNum,$rh_defaults)=@_; my $sth = $dbh->prepare("INSERT INTO Tournaments - (Title, Type, ParentId, Number,CreatedAt) - VALUES ($title, 'Т', $ParentId, $TourNum,NOW())"); - $sth->execute; + (Title, Type, ParentId, Number,CreatedAt) + VALUES (?, 'Т', $ParentId, $TourNum,NOW())"); + $sth->execute($title); my $TourId = $sth->{mysql_insertid}; while (my ($key,$value)=each %$rh_defaults) { - &UpdateTournament($dbh, $TourId, $key, $value); + &UpdateTournament($dbh, $TourId, $key, $value); } return $TourId; } - + MAIN: { @@ -264,179 +289,177 @@ MAIN: # Inherited fields for a Tour or Tournament # my %TourFields = ('Копирайт' => 'Copyright', - 'Инфо' => 'Info', 'URL' => 'URL', - 'Ссылка' => 'URL', 'Редактор' => 'Editors', - 'Обработан'=> 'EnteredBy', - 'Дата'=>'PlayedAt'); + 'Инфо' => 'Info', 'URL' => 'URL', + 'Ссылка' => 'URL', 'Редактор' => 'Editors', + 'Обработан'=> 'EnteredBy', + 'Дата'=>'PlayedAt', 'PlayedAt2'=>'PlayedAt2'); # # Inherited fields for a Question # my %QuestionFields = ('Тип'=> 'Type', 'Вид'=> 'Type', - 'Автор' => 'Authors', 'Рейтинг'=>'Rating', - 'Источник' => 'Sources', - 'Тема' => 'Topic'); - - + 'Автор' => 'Authors', 'Рейтинг'=>'Rating', + 'Источник' => 'Sources', + 'Тема' => 'Topic'); + + my($source); my($dbh) = DBI->connect("DBI:mysql:chgk", "piataev", "") - or die "Can't connect to DB chgk\n"; + or die "Can't connect to DB chgk\n"; if ($dbh->get_info( 18 )=~/^(5|(4.1))/) {$dbh->do("SET NAMES 'koi8r'");} - my @sources; + my @sources; open UNSORTED, ">$unsortedname"; while ($source = shift) { push @sources,glob($source); } foreach $source(@sources) { - my $TourNum=0; - my($PlayedAt) = ''; - my($QuestionId, $TourId, $TournamentId, $ParentId) = (0, 0, 0, 0); - my($tournum, $qnum, $all_qnum) = (0, 0, 0); - my (@d) = (localtime((stat($source))[9]))[5,4,3]; - $d[1]++; - $d[1]=sprintf("%02d",$d[1]); - $d[2]=sprintf("%02d",$d[2]); - $d[0]+=1900; - my $UnquotedCreated=join('-', @d); - my ($CreatedAt) = $dbh->quote($UnquotedCreated); - - open INFD, $source - or die "Can't open input file: $!\n"; - - $source =~ s/^.*\/([^\/]*)$/$1/; - my $unquotedsource=$source; - $unquotedsource=~s/\.txt\s*$//; - $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 =~ /Пакет/) { - ($TournamentId, $ParentId) = CheckFile($dbh,$source,$value); - if (!$TournamentId) { - last; - } - $sth = $dbh->prepare("UPDATE Tournaments SET - Title=$value, Type='Ч', - ParentId=$ParentId, - FileName=$source, - CreatedAt=$CreatedAt + my $TourNum=0; + my($PlayedAt) = ''; + my($QuestionId, $TourId, $TournamentId, $ParentId) = (0, 0, 0, 0); + my($tournum, $qnum, $all_qnum) = (0, 0, 0); + my (@d) = (localtime((stat($source))[9]))[5,4,3]; + $d[1]++; + $d[1]=sprintf("%02d",$d[1]); + $d[2]=sprintf("%02d",$d[2]); + $d[0]+=1900; + my $UnquotedCreated=join('-', @d); + my ($CreatedAt) = $UnquotedCreated; + + open INFD, $source + or die "Can't open input file: $!\n"; + + $source =~ s/^.*\/([^\/]*)$/$1/; + my $unquotedsource=$source; + $unquotedsource=~s/\.txt\s*$//; + print STDERR "Файл: $source, дата: $CreatedAt "; + my %TourDefaults=('CreatedAt'=>$CreatedAt); + my %QuestionDefaults=(); + my %QuestionGlobalDefaults=('Type'=>'Ч'); + while (($key, $value) = getField(\*INFD, $dbh)) { + + last if (!$key); + + if ($key =~ /Мета/) { + next; # This is obsolete + } + if ($key =~ /Чемпионат/ || $key =~ /Пакет/) { + ($TournamentId, $ParentId) = CheckFile($dbh,$source,$value); + if (!$TournamentId) { + last; + } + + $sth = $dbh->prepare("UPDATE Tournaments SET + Title=?, Type='Ч', + ParentId=?, + FileName=?, + CreatedAt=? WHERE - Id=$TournamentId"); - $sth->execute; - next; - } - if ($key =~ /Тур/) { - if ($TourId) { - - $dbh->do("UPDATE Tournaments SET QuestionsNum=$qnum - WHERE Id=$TourId"); - } - $qnum = 0; - $TourNum++; - $TourDefaults{'FileName'}=$dbh->quote( - "$unquotedsource.$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); + Id=?"); + $sth->execute($value,$ParentId,$source,$CreatedAt,$TournamentId); + next; + } + if ($key =~ /Тур/) { + if ($TourId) { + $dbh->do("UPDATE Tournaments SET QuestionsNum=$qnum + WHERE Id=$TourId"); + } + $qnum = 0; + $TourNum++; + $TourDefaults{'FileName'}= "$unquotedsource.$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) - 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; - } - - if ($key =~ /Ответ/) { - &UpdateQuestion($dbh, $QuestionId, "Answer", $value); - next; - } - - - if ($key =~ /Зач[её]т/) { - &UpdateQuestion($dbh, $QuestionId, "PassCriteria", $value); - next; - } - - - - if ($key =~ /Комментари/) { - &UpdateQuestion($dbh, $QuestionId, "Comments", $value); - next; - } - - - - my @Fields = grep { $key =~ /$_/ } keys %QuestionFields; - - 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; - } - - @Fields = grep { $key =~ /$_/ } keys %TourFields; - - 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, $field, $value); - $TourDefaults{$field}=$value; - } - next; - } - - - # - # If we are here, something got wrong! - # - print STDERR "\nЯ НЕ ПОНИМАЮ: $key, $value!\n"; - - } - $dbh->do("UPDATE Tournaments SET QuestionsNum=$qnum - WHERE Id=$TourId"); - $dbh->do("UPDATE Tournaments SET QuestionsNum=$all_qnum - WHERE Id=$TournamentId"); - &UpdateParents($dbh, $ParentId, $all_qnum,$UnquotedCreated); - print STDERR "Всего вопросов: $all_qnum \n"; + } + my $query = "INSERT INTO Questions + (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; + } + if ($key =~ /Ответ/) { + &UpdateQuestion($dbh, $QuestionId, "Answer", $value); + next; + } + + if ($key =~ /Зач[её]т/) { + &UpdateQuestion($dbh, $QuestionId, "PassCriteria", $value); + next; + } + + if ($key =~ /Комментари/) { + &UpdateQuestion($dbh, $QuestionId, "Comments", $value); + next; + } + + my @Fields = grep { $key =~ /$_/ } keys %QuestionFields; + + 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; + } + + @Fields = grep { $key =~ /$_/ } keys %TourFields; + + if (scalar @Fields) { + my $word = shift @Fields; + my $field = $TourFields{$word}; + my $updateId; + if ($QuestionId) { + print STDERR "ОШИБКА: $key $value недопустимы после", + " начала вопросов\n"; + } else { + if ($TourId) { + $updateId = $TourId; + } else { + $updateId = $TournamentId; + $TourDefaults{$field}=$value; + } + &UpdateTournament($dbh, $updateId, $field, $value); + } + next; + } + + + # + # If we are here, something got wrong! + # + print STDERR "\nЯ НЕ ПОНИМАЮ: $key, $value!\n"; + + } + $dbh->do("UPDATE Tournaments SET QuestionsNum=$qnum + WHERE Id=$TourId"); + $dbh->do("UPDATE Tournaments SET QuestionsNum=$all_qnum + WHERE Id=$TournamentId"); + &UpdateParents($dbh, $ParentId, $all_qnum,$UnquotedCreated); + print STDERR "Всего вопросов: $all_qnum \n"; } close UNSORTED; unlink $unsortedname unless $isunsorted;