--- db/prgsrc/updatedb.pl	2000/10/22 23:47:06	1.16
+++ db/prgsrc/updatedb.pl	2002/01/12 05:01:36	1.23
@@ -22,7 +22,7 @@ The database, user and password are hard
 
 Dmitry Rubinstein
 
-=head1 $Id: updatedb.pl,v 1.16 2000/10/22 23:47:06 boris Exp $
+=head1 $Id: updatedb.pl,v 1.23 2002/01/12 05:01:36 roma7 Exp $
 
 =cut
 
@@ -70,9 +70,11 @@ 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 =~ s/\s+$//;
 	    $value = $dbh->quote($value);
 	    return ($key, $value);
 	}
@@ -89,6 +91,7 @@ sub getField {
 	}
     }
     if ($key && $value) {
+        $value=~s/\s+$//;
 	$value = $dbh->quote($value);
 	return ($key, $value);
     }
@@ -199,10 +202,10 @@ sub GetTours {
 }
 
 sub CreateTour {
-    my ($dbh,$title,$ParentId,$rh_defaults)=@_;
+    my ($dbh,$title,$ParentId,$TourNum,$rh_defaults)=@_;
     my $sth = $dbh->prepare("INSERT INTO Tournaments
-			     (Title, Type, ParentId) 
-			     VALUES ($title, 'Т', $ParentId)");
+			     (Title, Type, ParentId, Number) 
+			     VALUES ($title, 'Т', $ParentId, $TourNum)");
     $sth->execute;
     my $TourId = $sth->{mysql_insertid};
     while (my ($key,$value)=each %$rh_defaults) {
@@ -228,7 +231,8 @@ MAIN:
     #
     my %QuestionFields = ('Тип'=> 'Type', 'Вид'=> 'Type', 
 			  'Автор' => 'Authors', 'Рейтинг'=>'Rating', 
-			  'Источник' => 'Sources');
+			  'Источник' => 'Sources',
+			  'Тема' => 'Topic');
 			  
 		      
     my($source);
@@ -237,6 +241,7 @@ MAIN:
 	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) = (0, 0, 0);
@@ -281,7 +286,9 @@ MAIN:
 			      WHERE Id=$TourId");
 		}
 		$qnum = 0;
-		$TourId=CreateTour($dbh,$value,$TournamentId,\%TourDefaults);
+		$TourNum++;
+		$TourId=CreateTour($dbh,$value,$TournamentId,$TourNum,
+				   \%TourDefaults);
 		%QuestionDefaults=%QuestionGlobalDefaults;
 		$QuestionId=0;
 		next;	
@@ -289,7 +296,8 @@ MAIN:
 	    if ($key =~ /Вопрос/) {
 		if (!$TourId) {
 		    $qnum = 0;
-		    $TourId=CreateTour($dbh,'1',$TournamentId,
+		    $TourNum++;
+		    $TourId=CreateTour($dbh,'1',$TournamentId,$TourNum,
 				       \%TourDefaults);
 		    %QuestionDefaults=%QuestionGlobalDefaults;
 		}