--- db/prgsrc/updatedb.pl	2000/10/22 04:44:53	1.13
+++ db/prgsrc/updatedb.pl	2010/04/24 18:13:03	1.48
@@ -6,13 +6,19 @@ updatedb.pl - a script for creation of n
 
 =head1 SYNOPSIS
 
-updatedb.pl I<file1> I<file2>....
+updatedb.pl B<[-i]> I<file1> I<file2>....
 
 
 =head1 DESCRIPTION
 
 Updates information in the B<chgk> databse. Uses file
 
+=head1 OPTIONS
+
+=item B<-i> 
+
+Ask about ParentId. 
+
 
 =head1 BUGS
 
@@ -22,10 +28,20 @@ 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.48 2010/04/24 18:13:03 roma7 Exp $
 
 =cut
 
+use vars qw($opt_i, $opt_n);
+
+use Getopt::Std;
+my $unsortedname="../dump/unsorted";
+getopts('in');
+#open STDERR, ">errors";
+my $Interactive=$opt_i || 0;
+my $newOnly = $opt_n ||0;
+my $DUMPDIR = $ENV{DUMPDIR} || "../dump";
+
 my (%RevMonths) = 
     ('Jan', '1', 'Feb', '2', 'Mar', '3', 'Apr', '4', 'May', '5', 'Jun', '6',
      'Jul', '7', 'Aug', '8', 'Sep', '9', 'Oct', '10', 'Nov', '11',
@@ -44,53 +60,74 @@ my ($sth);
 
 use DBI;
 use strict;
-
+use Data::Dumper;
+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 parseDate {
+  my $value = shift;
+  my ($from, $to) = split /\s+\-+\s+/, $value;
+  $from =~ s/^(.*)-(.*)-(.*)$/$3-$2-$1/;
+  my($month) = $RevMonths{$2} || '01';
+  $from =~ s/-(.*)-/-$month-/;
+  $from =~ s/-00*$/-01/;
+  if ($to) {
+    $to =~ s/^(.*)-(.*)-(.*)$/$3-$2-$1/;
+    $month = $RevMonths{$2} || '01';    
+    $to =~ s/-(.*)-/-$month-/;
+    $to =~ s/-00*$/-01/;
+  }
+  return ($from, $to);
+  
+}
+
 sub getField {
     my($desc, $dbh) = @_;
     my($key);
     my($value) = ('');
     while (<$desc>) {
-	s/[
]//g;
+	s/[
+]//g;
 	if ($key && /^\s*$/) {
 	    chomp $value;
+            $value =~ s/\s+$//;
 	    chomp $key;
 	    if ($key eq 'Дата') {
-		$value =~ s/^(.*)-(.*)-(.*)$/$3-$2-$1/;
-		my($month) = $RevMonths{$2} || '000';
-		$value =~ s/$2/$month/;
+	      my ($from, $to) = parseDate($value);
+	      $value = {'PlayedAt'=>$from, 'PlayedAt2'=>$to};
 	    }
-	    $value = $dbh->quote($value);
+	    if ($key eq 'Автор') {$value=~s/\.$//;}
 	    return ($key, $value);
 	}
 	next if (/^\s*$/);
 	
-	if (s/^(.*?)[:\.]\s*// && !$key) {
+	if (!$key && /^(.*?)[:\.]\s*(.*)$/s) {
 	    $key = $1;
-	    $value=$_;
+	    $value=$2;
 	    next;
 	}
 	if ($key) {
-	    $value .= $_;
+	    $value .= $_."\n";
 	    next;
 	}
     }
     if ($key && $value) {
-	$value = $dbh->quote($value);
-	return ($key, $value);
+        $value=~s/\s+$//sm;
+	      return ($key, $value);
     }
     return (0, 0);
 }
@@ -98,43 +135,77 @@ sub getField {
 sub SelectGroup {
     my ($dbh, $source, $TourName) = @_;
     my ($sth, $ParentId, $i, @arr);
-    
-    $sth = $dbh->prepare("SELECT Id, Title FROM
+
+    if ($Interactive) {    
+    	$sth = $dbh->prepare("SELECT Id, Title FROM
 		Tournaments WHERE Type = 'Г'");
-    $sth->execute;
-    print "Выберите группу для турнира:\n$TourName, файл $source\n\n";
-    while (@arr=$sth->fetchrow) {
-	print "[$arr[0]] $arr[1]\n";
-    }
-    $ParentId = <STDIN>;
-    chomp $ParentId;
-    if (!$ParentId) {
-	print "Пропускаем файл $source\n";
-	print STDERR "Файл $source отвергнут оператором\n";
-	return (0,0);
-    } else {
-	print "Вы выбрали турнир: $ParentId\n";
-	$sth = $dbh->prepare("INSERT INTO Tournaments
+    	$sth->execute;
+    	print "Выберите группу для турнира:\n$TourName, файл $source\n\n";
+    	while (@arr=$sth->fetchrow) {
+		print "[$arr[0]] $arr[1]\n";
+    	}
+    	$ParentId = <STDIN>;
+    	chomp $ParentId;
+    	if (!$ParentId) {
+		print "Пропускаем файл $source\n";
+		print STDERR "Файл $source отвергнут оператором\n";
+		return (0,0);
+    	} else {
+		print "Вы выбрали турнир: $ParentId\n";
+		$sth = $dbh->prepare("INSERT INTO Tournaments
 			      (Title, Type, ParentId, FileName) 
 			       VALUES ($TourName, 'Ч', $ParentId, 
                                        $source)");
-	$sth->execute;
-	my $TournamentId = $sth->{mysql_insertid};
-	return ($TournamentId,$ParentId);
-    }
+		$sth->execute;
+		my $TournamentId = $sth->{mysql_insertid};
+		return ($TournamentId,$ParentId);
+	}
+    } else {
+# Теперь, если файла нет в дереве турниров, никаких вопросов не 
+# задаётся, а вместо этого он добавляется в группу 9999
+		$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,CreatedAt) 
+			       VALUES (".$dbh->quote($TourName).", 'Ч', $ParentId, 
+                                       ?,NOW())");
+                $sth->execute($source);
+		my $TournamentId = $sth->{mysql_insertid};
+		return ($TournamentId,$ParentId);
+	}
 		
     
 }
 
 sub UpdateTournament {
     my ($dbh, $TournamentId, $field, $value) = @_;
-    $dbh->do("UPDATE Tournaments SET $field=$value WHERE Id=$TournamentId")
-	or die $dbh->errstr;
+    if (ref $value eq 'HASH') {
+	    # It means that $value contains information about several fields
+	    foreach my $k(keys %$value) {
+	      if ($value->{$k}) {
+          &UpdateTournament($dbh, $TournamentId, $k, $value->{$k});
+        }
+      }
+    } else {    
+      my $v = $dbh->quote($value);
+      $dbh->do("UPDATE Tournaments SET $field=$v WHERE Id=$TournamentId")
+	    or die $dbh->errstr;
+    }
 }
 
 sub UpdateQuestion {
     my ($dbh, $QuestionId, $field, $value) = @_;
-    $dbh->do("UPDATE Questions SET $field=$value 
+    
+    if (($field eq 'Type') && ($value eq "Д")) {
+         $value = "ЧД";
+    }
+    my $v = $dbh->quote($value);
+    $dbh->do("UPDATE Questions SET $field=$v
 		WHERE QuestionId=$QuestionId")
 	or die $dbh->errstr;
 }
@@ -142,14 +213,17 @@ sub UpdateQuestion {
 sub CheckFile {
     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;
+                             WHERE FileName=? AND Type='Ч'");
+    $sth->execute($source) or die $dbh->errstr;
     my @arr = $sth->fetchrow;
     if (! scalar @arr) {
 	return SelectGroup($dbh,$source,$title);
     }
     my($Id,$ParentId,$QuestionsNum)=@arr;
     if($QuestionsNum) {	
+        if ($newOnly) {
+	  return (0,0);
+	}
 	print "Файл $source с данными $title уже существует. ",
 	"Заменить?[y/N]\n";
 	my $answer = <STDIN>;
@@ -199,14 +273,14 @@ 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)");
-    $sth->execute;
+			     (Title, Type, ParentId, Number,CreatedAt) 
+			     VALUES (?, 'Т', $ParentId, $TourNum,NOW())");
+    $sth->execute($title);
     my $TourId = $sth->{mysql_insertid};
     while (my ($key,$value)=each %$rh_defaults) {
-	&UpdateTournament($dbh, $TourId, $key, $value);
+	    &UpdateTournament($dbh, $TourId, $key, $value);
     }
     return $TourId;
 }
@@ -222,133 +296,160 @@ MAIN:
 		      'Инфо' => 'Info', 'URL' => 'URL',
 		      'Ссылка' => 'URL', 'Редактор' => 'Editors',
 		      'Обработан'=> 'EnteredBy',
-		      'Дата'=>'PlayedAt');
+		      'Дата'=>'PlayedAt', 'PlayedAt2'=>'PlayedAt2');
     #
     # Inherited fields for a Question
     #
     my %QuestionFields = ('Тип'=> 'Type', 'Вид'=> 'Type', 
-			  'Автор' => 'Authors', 
-			  'Источник' => 'Source');
+			  'Автор' => 'Authors', 'Рейтинг'=>'Rating', 
+			  'Источник' => 'Sources',
+			  'Тема' => 'Topic');
 			  
 		      
     my($source);
     
     my($dbh) = DBI->connect("DBI:mysql:chgk", "piataev", "")
 	or die "Can't connect to DB chgk\n";
-    
+if ($dbh->get_info( 18 )=~/^(5|(4.1))/)  {$dbh->do("SET NAMES 'koi8r'");}
+    my @sources;	
+    open UNSORTED, ">$unsortedname";
     while ($source = shift) {
+       push @sources,glob($source);
+    }
+    foreach $source(@sources) {
+	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[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) = $UnquotedCreated;
 
 	open INFD, $source 
 	    or die "Can't open input file: $!\n";
 	
 	$source =~ s/^.*\/([^\/]*)$/$1/;
-	$source = $dbh->quote($source);
+	my $unquotedsource=$source;
+	$unquotedsource=~s/\.txt\s*$//;
 	print STDERR "Файл: $source, дата: $CreatedAt ";
 	my %TourDefaults=('CreatedAt'=>$CreatedAt);
 	my %QuestionDefaults=();
-	my %QuestionGlobalDefaults=();
+	my %QuestionGlobalDefaults=('Type'=>'Ч');
 	while (($key, $value) = getField(\*INFD, $dbh)) {
-	    last if (!$key);
+	  
+    last if (!$key);
 	    
-	    if ($key =~ /Мета/) {
-		next;   # This is obsolete
-	    }
-	    if ($key =~ /Чемпионат/ || $key =~ /Пакет/) {		
-		($TournamentId, $ParentId) = CheckFile($dbh,$source,$value);
-		if (!$TournamentId)  {
+    if ($key =~ /Мета/) {
+		  next;   # This is obsolete
+    }
+    if ($key =~ /Чемпионат/ || $key =~ /Пакет/) {		
+		  ($TournamentId, $ParentId) = CheckFile($dbh,$source,$value);
+		  if (!$TournamentId)  {
 		    last;
-		}	
-		$sth = $dbh->prepare("UPDATE Tournaments SET
-			             Title=$value, Type='Ч', 
-                                     ParentId=$ParentId, 
-                                     FileName=$source, 
-                                     CreatedAt=$CreatedAt
+		  }	
+
+		  $sth = $dbh->prepare("UPDATE Tournaments SET
+			             Title=?, Type='Ч', 
+                                     ParentId=?, 
+                                     FileName=?, 
+                                     CreatedAt=?
                                      WHERE
-                                     Id=$TournamentId");
-		$sth->execute;
-		next;
-	    }
-	    if ($key =~ /Тур/) {
-		if ($TourId) {
-		    $dbh->do("UPDATE Tournaments SET QuestionsNum=$qnum
+                                     Id=?");
+		  $sth->execute($value,$ParentId,$source,$CreatedAt,$TournamentId);
+		  next;
+    }
+    if ($key =~ /Тур/) {      
+		  if ($TourId) {
+	    		$dbh->do("UPDATE Tournaments SET QuestionsNum=$qnum
 			      WHERE Id=$TourId");
-		}
-		$qnum = 0;
-		$TourId=CreateTour($dbh,$value,$TournamentId,\%TourDefaults);
-		%QuestionDefaults=%QuestionGlobalDefaults;
-		$QuestionId=0;
-		next;	
-	    }
-	    if ($key =~ /Вопрос/) {
-		if (!$TourId) {
+		  }
+		  $qnum = 0;
+		  $TourNum++;
+		  $TourDefaults{'FileName'}= "$unquotedsource.$TourNum";
+						
+
+		  $TourId=CreateTour($dbh,$value,$TournamentId,$TourNum,
+				   \%TourDefaults);
+		  %QuestionDefaults=%QuestionGlobalDefaults;
+		  $QuestionId=0;
+		  next;	
+    }
+    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\')";
-		$sth = $dbh->prepare($query);
-		$sth->execute or print $query;;
-		$QuestionId = $sth->{mysql_insertid};
-		&UpdateQuestion($dbh, $QuestionId, "Question", $value);
-		while (my ($key,$value)=each %QuestionDefaults) {
+        %QuestionDefaults=%QuestionGlobalDefaults;
+  		}
+  		my $query = "INSERT INTO Questions 
+			     (ParentId, Number) 
+			     VALUES ($TourId, $qnum+1)";
+  		$sth = $dbh->prepare($query);
+  		$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;
-	    }
-
-	    if ($key =~ /Ответ/) {
-		&UpdateQuestion($dbh, $QuestionId, "Answer", $value);
-		next;
-	    }
-
-	    if ($key =~ /Комментари/) {
-		&UpdateQuestion($dbh, $QuestionId, "Comments", $value);
-		next;
-	    }
-	    
-	    my @Fields = grep /$key/, keys %QuestionFields;
-
-	    if (scalar @Fields) {
-		my $word = shift @Fields;
-		my $field = $QuestionFields{$word};
-		if ($QuestionId) {
-		    &UpdateQuestion($dbh, $QuestionId, $field, $value);
-		} elsif ($TourId) {
+  		}		
+  		$qnum++;
+  		$all_qnum++;
+  		next;
+    }
+    if ($key =~ /Ответ/) {
+      &UpdateQuestion($dbh, $QuestionId, "Answer", $value);
+		  next;
+    }
+
+    if ($key =~ /Зач[её]т/) {
+		  &UpdateQuestion($dbh, $QuestionId, "PassCriteria", $value);
+		  next;
+    }
+
+    if ($key =~ /Комментари/) {
+  		&UpdateQuestion($dbh, $QuestionId, "Comments", $value);
+  		next;
+    }
+   
+    my @Fields = grep { $key =~ /$_/ } keys %QuestionFields;
+
+    if (scalar @Fields) {
+		  my $word = shift @Fields;
+		  my $field = $QuestionFields{$word};
+		  if ($QuestionId) {
+          &UpdateQuestion($dbh, $QuestionId, $field, $value);
+		  } elsif ($TourId) {
 		    $QuestionDefaults{$field}=$value;
-		} else {
+		  } else {
 		    $QuestionGlobalDefaults{$field}=$value;
-		}
-		next;
-	    }
+		  }
+		  next;
+    }
 
-	    @Fields = grep /$key/, keys %TourFields;
+    @Fields = grep { $key =~ /$_/ } keys %TourFields;
 
-	    if (scalar @Fields) {
-		my $word = shift @Fields;
-		my $field = $TourFields{$word};
-		if ($QuestionId) {
+    if (scalar @Fields) {
+  		my $word = shift @Fields;
+  		my $field = $TourFields{$word};
+  		my $updateId;
+  		if ($QuestionId) {
 		    print STDERR "ОШИБКА: $key $value недопустимы после",
 		    " начала вопросов\n";
-		} elsif ($TourId) {
-		    &UpdateTournament($dbh, $TourId, $field, $value);
-		} else {
-		    &UpdateTournament($dbh, $TournamentId, $field, $value);
-		    $TourDefaults{$field}=$value;
-		}
-		next;
-	    }
+  		} else {
+  		  if ($TourId) {
+  		    $updateId = $TourId;
+        } else {
+          $updateId = $TournamentId;
+          $TourDefaults{$field}=$value;
+        }
+        &UpdateTournament($dbh, $updateId, $field, $value);
+  		}
+  		next;
+    }
 
 	    
 	    #
@@ -361,8 +462,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 $unsortedname unless $isunsorted;
     $dbh->disconnect;
 }