--- db/prgsrc/updatedb.pl	2002/11/11 09:43:20	1.27
+++ db/prgsrc/updatedb.pl	2004/01/19 19:42:04	1.40
@@ -28,17 +28,18 @@ The database, user and password are hard
 
 Dmitry Rubinstein
 
-=head1 $Id: updatedb.pl,v 1.27 2002/11/11 09:43:20 roma7 Exp $
+=head1 $Id: updatedb.pl,v 1.40 2004/01/19 19:42:04 boris Exp $
 
 =cut
 
 use vars qw($opt_i);
 
 use Getopt::Std;
+my $unsortedname="../dump/unsorted";
 getopts('i');
-
+#open STDERR, ">errors";
 my $Interactive=$opt_i || 0;
-
+my $DUMPDIR = $ENV{DUMPDIR} || "../dump";
 
 my (%RevMonths) = 
     ('Jan', '1', 'Feb', '2', 'Mar', '3', 'Apr', '4', 'May', '5', 'Jun', '6',
@@ -58,21 +59,24 @@ my ($sth);
 
 use DBI;
 use strict;
-
+my $isunsorted=0;
 sub UpdateParents {
-    my ($dbh, $ParentId, $all_qnum) = @_;
+    my ($dbh, $ParentId, $all_qnum,$CreatedAt) = @_;
     if ($ParentId) {
-	my ($sth1) = $dbh->prepare("SELECT QuestionsNum, ParentId 
+	my ($sth1) = $dbh->prepare("SELECT QuestionsNum, ParentId, CreatedAt
 FROM Tournaments WHERE Id = $ParentId");
 	$sth1->execute;
-	my ($q, $p) = ($sth1->fetchrow)[0, 1];
+	my ($q, $p,$c) = ($sth1->fetchrow)[0, 1, 2];
+	$c=$CreatedAt if $CreatedAt && ($CreatedAt gt $c);
+	my $qc=$dbh->quote($c);
 	$dbh->do("UPDATE Tournaments SET 
-                  QuestionsNum=$q + $all_qnum 
+                  QuestionsNum=$q + $all_qnum, CreatedAt=$qc
                   WHERE Id = $ParentId");
-	&UpdateParents($dbh, $p, $all_qnum);
+	&UpdateParents($dbh, $p, $all_qnum,$c);
     }
 }
 
+
 sub getField {
     my($desc, $dbh) = @_;
     my($key);
@@ -89,6 +93,7 @@ sub getField {
 		$value =~ s/-(.*)-/-$month-/;
 		$value =~ s/-00*$/-01/;
 	    }
+	    if ($key eq 'Автор') {$value=~s/\.$//;}
 	    $value = $dbh->quote($value);
 	    return ($key, $value);
 	}
@@ -143,8 +148,12 @@ sub SelectGroup {
     } else {
 # Теперь, если файла нет в дереве турниров, никаких вопросов не 
 # задаётся, а вместо этого он добавляется в группу 9999
-	$ParentId = 9999;
-		print UNSORTED "$source\n";	
+		$ParentId = 9999;
+		my $tempsource=$source;
+		my $temptname=$TourName;
+                $tempsource=~s/^\'(.*)\'$/$1/;
+                $temptname=~s/^\'(.*)\'$/$1/;
+	   	print UNSORTED "$tempsource".((12 -length($source))x' ')."\t$temptname\n";
 		$isunsorted=1;
 		$sth = $dbh->prepare("INSERT INTO Tournaments
 			      (Title, Type, ParentId, FileName) 
@@ -166,6 +175,10 @@ sub UpdateTournament {
 
 sub UpdateQuestion {
     my ($dbh, $QuestionId, $field, $value) = @_;
+    
+    if (($field eq 'Type') && ($value eq "'Д'")) {
+         $value = "'ЧД'";
+    }
     $dbh->do("UPDATE Questions SET $field=$value 
 		WHERE QuestionId=$QuestionId")
 	or die $dbh->errstr;
@@ -265,12 +278,11 @@ MAIN:
 			  
 		      
     my($source);
-    my $isunsorted=0;
     
     my($dbh) = DBI->connect("DBI:mysql:chgk", "piataev", "")
 	or die "Can't connect to DB chgk\n";
     my @sources;	
-    open UNSORTED, ">unsorted";
+    open UNSORTED, ">$unsortedname";
     while ($source = shift) {
        push @sources,glob($source);
     }
@@ -281,13 +293,18 @@ MAIN:
 	my($tournum, $qnum, $all_qnum) = (0, 0, 0);
 	my (@d) = (localtime((stat($source))[9]))[5,4,3];
 	$d[1]++;
+	$d[1]=sprintf("%02d",$d[1]);
+	$d[2]=sprintf("%02d",$d[2]);
 	$d[0]+=1900;
-	my ($CreatedAt) = $dbh->quote( join('-', @d));
+	my $UnquotedCreated=join('-', @d);
+	my ($CreatedAt) = $dbh->quote($UnquotedCreated);
 
 	open INFD, $source 
 	    or die "Can't open input file: $!\n";
 	
 	$source =~ s/^.*\/([^\/]*)$/$1/;
+	my $unquotedsource=$source;
+	$unquotedsource=~s/\.txt\s*$//;
 	$source = $dbh->quote($source);
 	print STDERR "Файл: $source, дата: $CreatedAt ";
 	my %TourDefaults=('CreatedAt'=>$CreatedAt);
@@ -316,11 +333,15 @@ MAIN:
 	    }
 	    if ($key =~ /Тур/) {
 		if ($TourId) {
-		    $dbh->do("UPDATE Tournaments SET QuestionsNum=$qnum
+
+	    		$dbh->do("UPDATE Tournaments SET QuestionsNum=$qnum
 			      WHERE Id=$TourId");
 		}
 		$qnum = 0;
 		$TourNum++;
+		$TourDefaults{'FileName'}=$dbh->quote(
+                        			"$unquotedsource.$TourNum"
+						);
 		$TourId=CreateTour($dbh,$value,$TournamentId,$TourNum,
 				   \%TourDefaults);
 		%QuestionDefaults=%QuestionGlobalDefaults;
@@ -355,10 +376,20 @@ MAIN:
 		next;
 	    }
 
+
+	    if ($key =~ /Зач[её]т/) {
+		&UpdateQuestion($dbh, $QuestionId, "PassCriteria", $value);
+		next;
+	    }
+
+
+
 	    if ($key =~ /Комментари/) {
 		&UpdateQuestion($dbh, $QuestionId, "Comments", $value);
 		next;
 	    }
+
+
 	    
 	    my @Fields = grep { $key =~ /$_/ } keys %QuestionFields;
 
@@ -403,10 +434,10 @@ MAIN:
 			WHERE Id=$TourId");
 	$dbh->do("UPDATE Tournaments SET QuestionsNum=$all_qnum
 			WHERE Id=$TournamentId");
-	&UpdateParents($dbh, $ParentId, $all_qnum);		
+	&UpdateParents($dbh, $ParentId, $all_qnum,$UnquotedCreated);		
 	print STDERR "Всего вопросов: $all_qnum \n";
     }
     close UNSORTED;
-    unlink "unsorted" unless $isunsorted;
+    unlink $unsortedname unless $isunsorted;
     $dbh->disconnect;
 }