--- db/prgsrc/updatedb.pl	2000/10/20 00:39:27	1.9
+++ db/prgsrc/updatedb.pl	2000/10/20 01:45:46	1.10
@@ -22,7 +22,7 @@ The database, user and password are hard
 
 Dmitry Rubinstein
 
-=head1 $Id: updatedb.pl,v 1.9 2000/10/20 00:39:27 boris Exp $
+=head1 $Id: updatedb.pl,v 1.10 2000/10/20 01:45:46 boris Exp $
 
 =cut
 
@@ -64,7 +64,7 @@ sub getField {
     my($key);
     my($value) = ('');
     while (<$desc>) {
-	s/
//;
+	s/
//g;
 	if ($key && /^\s*$/) {
 	    chomp $value;
 	    chomp $key;
@@ -78,7 +78,7 @@ sub getField {
 	}
 	next if (/^\s*$/);
 	
-	if (/^(.*)[:\.]\s*$/ && !$key) {
+	if (/^(.*)[:\.][\s]*$/ && !$key) {
 	    $key = $1;
 	    next;
 	}
@@ -139,7 +139,7 @@ sub UpdateQuestion {
 }
 
 sub CheckFile {
-    my ($dbh, $source,$title) = @_;
+    my ($dbh, $source, $title) = @_;
     my $sth = $dbh->prepare("SELECT Id,ParentId,QuestionsNum FROM Tournaments
                              WHERE FileName=$source AND Type='Ч'");
     $sth->execute or die $dbh->errstr;
@@ -148,14 +148,14 @@ sub CheckFile {
 	return SelectGroup($dbh,$source,$title);
     }
     my($Id,$ParentId,$QuestionsNum)=@arr;
-    if($QuestionsNum) {
+    if($QuestionsNum) {	
 	print "Файл $source с данными $title уже существует. ",
 	"Заменить?[y/N]\n";
 	my $answer = <STDIN>;
 	if ($answer !~ /^[yY]/) {
 	    return (0,0);
 	} else {
-	    DeleteTournament($dbh,$Id,0);
+	    DeleteTournament($dbh,$Id,$ParentId,$QuestionsNum,0);
 	}
     } 
     return($Id,$ParentId);	
@@ -163,7 +163,10 @@ sub CheckFile {
 
 
 sub DeleteTournament {
-    my ($dbh,$Id,$DeleteMyself) = @_;
+    my ($dbh,$Id,$ParentId,$QuestionsNum,$DeleteMyself) = @_;
+    if ($QuestionsNum) {
+	UpdateParents($dbh,$ParentId,-$QuestionsNum);
+    }
     my (@Tours) = &GetTours($dbh, $Id);
     foreach my $Tour (@Tours) {
 	DeleteTournament($dbh,$Tour,1);
@@ -219,20 +222,19 @@ MAIN:
 	$source =~ s/^.*\/([^\/]*)$/$1/;
 	$source = $dbh->quote($source);
 	print STDERR "Файл: $source, дата: $CreatedAt ";
-	
 	while (($key, $value) = getField(\*INFD, $dbh)) {
 	    last if (!$key);
 	    
 	    if ($key =~ /Мета/) {
 		next;   # This is obsolete
 	    }
-	    if ($key =~ /Чемпионат/ || $key =~ /Пакет/) {
+	    if ($key =~ /Чемпионат/ || $key =~ /Пакет/) {		
 		($TournamentId, $ParentId) = CheckFile($dbh,$source,$value);
 		if (!$TournamentId)  {
 		    last;
-		}
+		}	
 		$sth = $dbh->prepare("UPDATE Tournaments SET
-				     Title=$value, Type='Ч', 
+			             Title=$value, Type='Ч', 
                                      ParentId=$ParentId, 
                                      FileName=$source, 
                                      CreatedAt=$CreatedAt