--- db/prgsrc/updatedb.pl	2000/10/22 04:44:53	1.13
+++ db/prgsrc/updatedb.pl	2000/10/22 06:03:35	1.15
@@ -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.15 2000/10/22 06:03:35 boris Exp $
 
 =cut
 
@@ -78,9 +78,8 @@ sub getField {
 	}
 	next if (/^\s*$/);
 	
-	if (s/^(.*?)[:\.]\s*// && !$key) {
+	if (/^(.*)[:\.]\s*/ && !$key) {
 	    $key = $1;
-	    $value=$_;
 	    next;
 	}
 	if ($key) {
@@ -227,8 +226,8 @@ MAIN:
     # Inherited fields for a Question
     #
     my %QuestionFields = ('Тип'=> 'Type', 'Вид'=> 'Type', 
-			  'Автор' => 'Authors', 
-			  'Источник' => 'Source');
+			  'Автор' => 'Authors', 'Рейтинг'=>'Rating', 
+			  'Источник' => 'Sources');
 			  
 		      
     my($source);
@@ -239,7 +238,7 @@ MAIN:
     while ($source = shift) {
 	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 +252,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);
 	    
@@ -294,8 +293,8 @@ MAIN:
 		    %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 +317,7 @@ MAIN:
 		next;
 	    }
 	    
-	    my @Fields = grep /$key/, keys %QuestionFields;
+	    my @Fields = grep { $key =~ /$_/ } keys %QuestionFields;
 
 	    if (scalar @Fields) {
 		my $word = shift @Fields;
@@ -333,7 +332,7 @@ MAIN:
 		next;
 	    }
 
-	    @Fields = grep /$key/, keys %TourFields;
+	    @Fields = grep { $key =~ /$_/ } keys %TourFields;
 
 	    if (scalar @Fields) {
 		my $word = shift @Fields;