--- db/prgsrc/updatedb.pl	2000/10/22 02:25:02	1.12
+++ db/prgsrc/updatedb.pl	2000/10/22 04:44:53	1.13
@@ -22,7 +22,7 @@ The database, user and password are hard
 
 Dmitry Rubinstein
 
-=head1 $Id: updatedb.pl,v 1.12 2000/10/22 02:25:02 boris Exp $
+=head1 $Id: updatedb.pl,v 1.13 2000/10/22 04:44:53 boris 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($/);
+
 
 
 
@@ -198,11 +198,39 @@ sub GetTours {
 	return @Tours;
 }
 
+sub CreateTour {
+    my ($dbh,$title,$ParentId,$rh_defaults)=@_;
+    my $sth = $dbh->prepare("INSERT INTO Tournaments
+			     (Title, Type, ParentId) 
+			     VALUES ($title, 'Т', $ParentId)");
+    $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', 
+			  'Источник' => 'Source');
+			  
+		      
     my($source);
     
     my($dbh) = DBI->connect("DBI:mysql:chgk", "piataev", "")
@@ -223,6 +251,9 @@ MAIN:
 	$source =~ s/^.*\/([^\/]*)$/$1/;
 	$source = $dbh->quote($source);
 	print STDERR "Файл: $source, дата: $CreatedAt ";
+	my %TourDefaults=('CreatedAt'=>$CreatedAt);
+	my %QuestionDefaults=();
+	my %QuestionGlobalDefaults=();
 	while (($key, $value) = getField(\*INFD, $dbh)) {
 	    last if (!$key);
 	    
@@ -250,28 +281,17 @@ MAIN:
 			      WHERE Id=$TourId");
 		}
 		$qnum = 0;
-		$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;
+		$TourId=CreateTour($dbh,$value,$TournamentId,\%TourDefaults);
+		%QuestionDefaults=%QuestionGlobalDefaults;
+		$QuestionId=0;
+		next;	
 	    }
 	    if ($key =~ /Вопрос/) {
 		if (!$TourId) {
 		    $qnum = 0;
-		    $sth = $dbh->prepare("INSERT INTO Tournaments
-				         (Title, Type, ParentId, CreatedAt) 
-				          VALUES ('1', 'Т', $TournamentId, 
-                                          $CreatedAt)");
-		    $sth->execute;
-		    $TourId = $sth->{mysql_insertid};
+		    $TourId=CreateTour($dbh,'1',$TournamentId,
+				       \%TourDefaults);
+		    %QuestionDefaults=%QuestionGlobalDefaults;
 		}
 		my $query = "INSERT INTO Questions 
 			     (ParentId, Number, Type) 
@@ -280,6 +300,9 @@ MAIN:
 		$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;
@@ -290,67 +313,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!