--- db/prgsrc/updatedb.pl	2000/10/22 04:44:53	1.13
+++ db/prgsrc/updatedb.pl	2001/07/21 23:59:52	1.20
@@ -22,7 +22,7 @@ The database, user and password are hard
 
 Dmitry Rubinstein
 
-=head1 $Id: updatedb.pl,v 1.13 2000/10/22 04:44:53 boris Exp $
+=head1 $Id: updatedb.pl,v 1.20 2001/07/21 23:59:52 boris Exp $
 
 =cut
 
@@ -70,17 +70,18 @@ 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);
 	}
 	next if (/^\s*$/);
 	
-	if (s/^(.*?)[:\.]\s*// && !$key) {
+	if (!$key && /^(.*?)[:\.]\s*(.*)$/s) {
 	    $key = $1;
-	    $value=$_;
+	    $value=$2;
 	    next;
 	}
 	if ($key) {
@@ -199,10 +200,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) {
@@ -227,8 +228,8 @@ MAIN:
     # Inherited fields for a Question
     #
     my %QuestionFields = ('Тип'=> 'Type', 'Вид'=> 'Type', 
-			  'Автор' => 'Authors', 
-			  'Источник' => 'Source');
+			  'Автор' => 'Authors', 'Рейтинг'=>'Rating', 
+			  'Источник' => 'Sources');
 			  
 		      
     my($source);
@@ -237,9 +238,10 @@ 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, $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;
@@ -253,7 +255,7 @@ MAIN:
 	print STDERR "Файл: $source, дата: $CreatedAt ";
 	my %TourDefaults=('CreatedAt'=>$CreatedAt);
 	my %QuestionDefaults=();
-	my %QuestionGlobalDefaults=();
+	my %QuestionGlobalDefaults=('Type'=>$dbh->quote('Ч'));
 	while (($key, $value) = getField(\*INFD, $dbh)) {
 	    last if (!$key);
 	    
@@ -281,7 +283,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,13 +293,14 @@ MAIN:
 	    if ($key =~ /Вопрос/) {
 		if (!$TourId) {
 		    $qnum = 0;
-		    $TourId=CreateTour($dbh,'1',$TournamentId,
+		    $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};
@@ -318,7 +323,7 @@ MAIN:
 		next;
 	    }
 	    
-	    my @Fields = grep /$key/, keys %QuestionFields;
+	    my @Fields = grep { $key =~ /$_/ } keys %QuestionFields;
 
 	    if (scalar @Fields) {
 		my $word = shift @Fields;
@@ -333,7 +338,7 @@ MAIN:
 		next;
 	    }
 
-	    @Fields = grep /$key/, keys %TourFields;
+	    @Fields = grep { $key =~ /$_/ } keys %TourFields;
 
 	    if (scalar @Fields) {
 		my $word = shift @Fields;