--- db/prgsrc/updatedb.pl	2000/11/11 03:58:59	1.18
+++ 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.18 2000/11/11 03:58:59 boris Exp $
+=head1 $Id: updatedb.pl,v 1.22 2002/01/12 00:55:33 roma7 Exp $
 
 =cut
 
@@ -70,8 +70,9 @@ sub getField {
 	    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);
@@ -134,6 +135,7 @@ 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;
@@ -228,7 +230,8 @@ MAIN:
     #
     my %QuestionFields = ('Тип'=> 'Type', 'Вид'=> 'Type', 
 			  'Автор' => 'Authors', 'Рейтинг'=>'Rating', 
-			  'Источник' => 'Sources');
+			  'Источник' => 'Sources',
+			  'Тема' => 'Topic');
 			  
 		      
     my($source);
@@ -292,7 +295,8 @@ MAIN:
 	    if ($key =~ /Вопрос/) {
 		if (!$TourId) {
 		    $qnum = 0;
-		    $TourId=CreateTour($dbh,'1',$TournamentId,
+		    $TourNum++;
+		    $TourId=CreateTour($dbh,'1',$TournamentId,$TourNum,
 				       \%TourDefaults);
 		    %QuestionDefaults=%QuestionGlobalDefaults;
 		}