--- db/prgsrc/db.cgi	2002/01/14 11:31:43	1.59
+++ db/prgsrc/db.cgi	2002/06/15 02:20:23	1.69
@@ -43,6 +43,7 @@ my ($SRCPATH) = "$PWD/../dimrub/src";
 my ($ZIP) = "/home/piataev/bin/zip";
 my $DUMPFILE = "/tmp/chgkdump";
 my ($SENDMAIL) = "/usr/sbin/sendmail";
+my ($TMPDIR) = "/tmp";
 my ($TMSECS) = 30*24*60*60;
 my (%RevMonths) =
 	('Jan', '0', 'Feb', '1', 'Mar', '2', 'Apr', '3', 'May', '4', 'Jun', '5',
@@ -51,6 +52,9 @@ my (%RevMonths) =
 	 'Янв', '0', 'Фев', 1, 'Мар', 2, 'Апр', 3, 'Май', '4',
 	 'Июн', '5', 'Июл', 6, 'Авг', '7', 'Сен', '8',
 	 'Окт', '9', 'Ноя', '19', 'Дек', '11');
+my @months=('000','Jan',"Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct",
+          "Nov","Dec");
+
 
 # Determine whether the given time is within 2 months from now.
 sub NewEnough {
@@ -106,7 +110,7 @@ sub GetTourQuestions {
 	my (@arr, @Questions);
 
 	my ($sth) = $dbh->prepare("SELECT QuestionId FROM Questions
-		WHERE ParentId=$ParentId");
+		WHERE ParentId=$ParentId order by Number");
 
 	$sth->execute;
 
@@ -157,7 +161,7 @@ sub printform
   my $inputstring=textfield(-name=>'sstr',
                          -default=>param('sstr')||'',
                          -size=>30,
-                         -maxlength=>30);
+                         -maxlength=>50);
   my $qnumber="Выводить по".br. textfield(-name=>'kvo',
                          -default=>param('kvo')||'150',
                          -size=>3,
@@ -641,7 +645,7 @@ sub PrintList {
 
 	print "$nav".br."\n";
 	for (my $i = $first; $i <= $last; $i++) {
-		my $output = &PrintQuestion($dbh, $$Questions[$i-1], 1, $i, 1);
+		my $output = &PrintQuestion($dbh, $$Questions[$i-1], 1, 0, 1);
                 if (param('metod') eq 'rus' || param('metod') eq 'proxy')
                 {
 	             $output=~s/\b($shablon)\b/\<strong\>$1\<\/strong\>/gi;
@@ -817,7 +821,8 @@ sub PrintTournament {
 		}
 	} else {
 		my ($qnum) = GetQNum($dbh);
-		$output .= h2("Банк Вопросов: $qnum вопросов") . p . "\n";
+		$output .= h2("Банк Вопросов: $qnum вопрос".&Suffix($qnum)) 
+                          . p . "\n";
 	}
 
 	for ($i = 0; $i <= $#Tours; $i++) {
@@ -836,6 +841,7 @@ sub PrintTournament {
 			$qnum = '';
 		}
 		if ($Tournament{'Type'} =~ /Г/) {
+		    $SingleTour=0;
 			$imgsrc = "/icons/folder.gif";
 			$alt = "[*]";
 		} else {
@@ -1005,6 +1011,9 @@ sub PrintField {
 	    $value =~ s/^\s+/<br>&nbsp;&nbsp;&nbsp;&nbsp;/mg;
 	    $value =~ s/^\|([^\n]*)/<pre>$1<\/pre>/mg;
 	    $value =~ s/\s+-+\s+/&nbsp;&#0150; /mg;
+#	    $value =~ s/(\s)"/$1&#147;/mg;
+#	    $value =~ s/^"/&#147;/mg;
+#	    $value =~ s/"/&#148;/mg;
 	}
 
 
@@ -1018,6 +1027,8 @@ sub PrintQuestion {
 	my ($dbh, $Id, $answer, $qnum, $title, $text) = @_;
 	my ($output, $titles) = ('', '');
 	my (%Question) = &GetQuestion($dbh, $Id);
+	$qnum = $Question{'Number'}
+		if ($qnum == 0);
 	if (!$text) {
 		$output .= hr({width=>"50%"});
 		if ($title) {
@@ -1030,18 +1041,18 @@ sub PrintQuestion {
 					 a({href=>url . "?tour=$fname"}, $Tournament{'Title'}, $Tournament{'PlayedAt'}));
 			$titles .=
 				dl(dd(img({src=>"/icons/folder.open.gif"}) . " " .
-					a({href=>url . "?tour=$fname.$Tour{Number}"}, $Tour{'Title'})));
+					a({href=>url . "?tour=$fname.$Tour{Number}#$qnum"}, $Tour{'Title'})));
 		}
 		$output .= dl(strong($titles));
 	}
 
-	$qnum = $Question{'Number'}
-		if ($qnum == 0);
+
+	$output.= "<a NAME=\"$qnum\">";
 
 	$output .=
 		&PrintField("Вопрос $qnum", $Question{'Question'}, $text);
 
-	if ($answer) {
+	if ($answer==1) {
 		$output .=
 			&PrintField("Ответ", $Question{'Answer'}, $text);
 
@@ -1087,6 +1098,38 @@ sub PrintQuestion {
 			$output .= &PrintField("Комментарии", $Question{'Comments'}, $text);
 		}
 	}
+	elsif ($answer==2) {
+	  my $text=$Question{'Answer'};
+	  $text=~s/\n/<option>/mg;
+	  $output.="<select><option selected>Ответ:<option>$text</select>";
+	  $text=$Question{'Comments'}||'';
+	  if ($text) {
+             $text=~s/\n/<option>/mg;
+	     $output.="<select><option selected>Комментарий:<option>$text</select>"
+	  }
+	} 
+	elsif ($answer==3) {
+        $output.=  <<EOTT
+	  <div align=right STYLE="cursor:hand;" OnStart="toggle(document.all.HideShow$qnum);" OnClick="toggle(document.all.HideShow$qnum);">
+	  <font size=-2 color=red> Показать/убрать ответ</font></div>
+	  <span style="display:none" id=HideShow$qnum>
+EOTT
+          .&PrintField("Ответ", $Question{'Answer'}, $text);
+		if ($Question{'Authors'}) {
+			$output .= &PrintField("Автор(ы)", $Question{'Authors'}, $text);
+		}
+		if ($Question{'Sources'}) {
+			$output .= &PrintField("Источник(и)", $Question{'Sources'}, $text);
+		}
+
+		if ($Question{'Comments'}) {
+			$output .= &PrintField("Комментарии", $Question{'Comments'}, $text);
+		}
+
+
+$output.="</span>"
+
+	}
 #	$output.=br.a({href=> url."?metod=proxy&qid=$Id"}, 'Близкие вопросы').p
 #             if $answer;
 	return $output;
@@ -1178,7 +1221,8 @@ sub PrintArchive {
 		}
 		return @list;
 	}
-	return "$SRCPATH/$Tournament{'FileName'} ";
+#	return "$SRCPATH/$Tournament{'FileName'} ";
+	return "$TMPDIR/$Tournament{'FileName'} ";
 }
 
 sub PrintAll {
@@ -1345,6 +1389,147 @@ a({href=>url."?authors=surname"},"фамили
 }
 
 
+sub WriteFile {
+  my ($dbh,$fname) = @_;
+  $fname=~s/\.txt$//;
+  $fname=~s/.*\/(\w+)/$1/;
+  my $query= "SELECT Id, Title, Copyright, Info, URL, 
+                      Editors, EnteredBy, PlayedAt, CreatedAt 
+                     from Tournaments where FileName=".$dbh->quote("$fname.txt");
+  my $sth=$dbh->prepare($query);
+  my (%Question,%editor,%qnumber,%copyright,%author,%vid,%tourtitle);
+  $sth->execute;
+  my ($Id, $Title, $Copyright, $Info, $URL, 
+   $Editors, $EnteredBy, $PlayedAt, $CreatedAt)=
+      $sth->fetchrow;
+  return -1 unless $Id;
+  open (OUT, ">$TMPDIR/$fname.txt");
+  print OUT "Чемпионат:\n$Title\n\n";
+  my $date=$PlayedAt;
+  my ($year,$month,$day)=split /-/, $date;
+#  $month=0,$date=0 if $year && $month==1 && $day==1;
+  my $pdate=sprintf("%02d-%3s-%4d",$day,$months[$month],$year);
+
+  print OUT "Дата:\n$pdate\n\n" if $date;
+
+  print OUT "URL:\n$URL\n\n" if $URL;
+
+  print OUT "Инфо:\n$Info\n\n" if $Info;
+
+  print OUT "Копирайт:\n$Copyright\n\n" if $Copyright;
+
+  print OUT "Редактор:\n$Editors\n\n" if $Editors;
+
+
+  $query= "SELECT Id, Title, Copyright, Editors from Tournaments where ParentId=$Id order by Id";
+  $sth=$dbh->prepare($query);
+  $sth->execute;
+  my ($tourid,$tourtitle,$cright,$editor,@tours,$vid,$author,$tourauthor);
+
+
+  while (($tourid,$tourtitle,$cright,$editor)=$sth->fetchrow,$tourid)
+  {
+#    $text{$tourid}="Тур:\n$tourtitle\n\n";
+    $query= "SELECT * from Questions where ParentId=$tourid order by QuestionId";
+    my $sth1=$dbh->prepare($query);
+    $sth1->execute;
+    push(@tours,$tourid);
+    $tourtitle{$tourid}=$tourtitle;
+    $copyright{$tourid}=$cright;
+    $editor{$tourid}=$editor;
+    $vid='';
+    my $author='';
+    my $eqauthor=1;
+    my $qnumber=0;
+    my @arr;
+    while ( @arr=$sth1->fetchrow, $arr[0])
+    {
+	my($i, $name) = 0;
+	$qnumber++;
+	foreach $name (@{$sth1->{NAME}}) {
+	        $arr[$i]=~s/^(.*?)\s*$/$1/;
+		$Question{$tourid}[$qnumber]{$name} = $arr[$i++];
+	}
+	if ($vid)
+        {
+          if ($vid ne $Question{$tourid}[$qnumber]{'Type'}) {print STDERR "Warning: Different types for Tournament $tourid\n"}
+        } else 
+        {
+            $vid=$Question{$tourid}[$qnumber]{'Type'};
+        } 
+
+	if ($author)
+        {
+          if ($author ne $Question{$tourid}[$qnumber]{'Authors'})  
+          {
+             $eqauthor=0;
+          }
+        } else 
+        {
+            $author=$Question{$tourid}[$qnumber]{'Authors'};
+            $eqauthor=0 unless $author;
+        } 
+    }
+    $vid{$tourid}=$vid;
+    $qnumber{$tourid}=$qnumber;
+    $author{$tourid}=$eqauthor ? $author : '';
+  }
+
+
+  $vid='';
+  my $eqvid=1;
+  my $eqauthor=1;
+  foreach (@tours)
+  {
+     $vid||=$vid{$_};
+     if ($vid{$_} ne $vid)
+     {
+        $eqvid=0;
+     }
+     $author||=$author{$_};
+     if (!$author{$_} || ($author{$_} ne $author))
+     {
+        $eqauthor=0;
+     }
+  }
+  
+  print OUT "Вид:\n$vid\n\n" if $eqvid;
+  print OUT "Автор:\n$author\n\n" if $eqauthor;
+
+  foreach my $tour(@tours)
+  {
+     print OUT "Тур:\n$tourtitle{$tour}\n\n";
+     print OUT "Вид:\n$vid{$tour}\n\n" if  !$eqvid;
+     print OUT "Копирайт:\n$copyright{$tour}\n\n" if $copyright{$tour} && ($copyright{$tour} ne $Copyright);
+     print OUT "Редактор:\n$editor{$tour}\n\n" if $editor{$tour} && ($editor{$tour} ne $Editors);
+     $tourauthor=0;
+     if (!$eqauthor && $author{$tour})
+     { 
+       print OUT "Автор:\n$author{$tour}\n\n";
+       $tourauthor=1;
+     }
+     foreach my $q(1..$qnumber{$tour})
+     {
+        print OUT "Вопрос $q:\n".$Question{$tour}[$q]{'Question'}."\n\n";
+	print OUT  "Ответ:\n".$Question{$tour}[$q]{'Answer'}."\n\n";
+	print OUT  "Автор:\n".$Question{$tour}[$q]{'Authors'}."\n\n" 
+               if !$tourauthor && !$eqauthor && $Question{$tour}[$q]{'Authors'};
+	print OUT  "Комментарий:\n".$Question{$tour}[$q]{'Comments'}."\n\n" 
+               if $Question{$tour}[$q]{'Comments'};
+	print OUT "Источник:\n".$Question{$tour}[$q]{'Sources'}."\n\n" 
+               if $Question{$tour}[$q]{'Sources'};
+	print OUT "Рейтинг:\n".$Question{$tour}[$q]{'Rating'}."\n\n" 
+               if $Question{$tour}[$q]{'Rating'};
+
+     }
+  }
+
+  close OUT;
+
+
+
+}
+
 
 MAIN:
 {
@@ -1461,6 +1646,7 @@ $sstr=~s/[^йцукенгшщзхъфывапролджэячсмит
 			 );
 	    $tour = (param('tour')) ? param('tour') : 0;
 	    my (@files) = &PrintArchive($dbh, $tour);
+	    WriteFile($dbh,$_) foreach @files;
 	    open F, "$ZIP -j - $SRCPATH/COPYRIGHT @files |";
 	    print (<F>);
 	    close F;
@@ -1500,10 +1686,35 @@ $sstr=~s/[^йцукенгшщзхъфывапролджэячсмит
 	            $tour = ($sth->fetchrow)[0];
                     $sth->finish;
 		}
-		print &PrintTournament($dbh, $tour, param('answer'));
+		my $QuestionNumber=0;
+		my $qnum;
+		if ($qnum=param('qnumber')){
+      	          my ($sth) = $dbh->prepare("SELECT QuestionId FROM Questions
+		     WHERE ParentId=$tour AND Number=$qnum");
+		  $sth->execute;
+		  $QuestionNumber=($sth->fetchrow)[0]||0;
+	        }
+	        if ($QuestionNumber) {
+		  print &PrintQuestion($dbh, $QuestionNumber, param('answer')||0, $qnum, 1);
+#                                        $dbh, $Id, $answer, $qnum, $title, $text
+		} else  {
+  		   print &PrintTournament($dbh, $tour, param('answer'));
+  		}
 	}
 	if (!$text) {
 		print &Include_virtual("../dimrub/db/footer.html");
+print <<EEE
+  <SCRIPT LANGUAGE="JavaScript">
+function toggle(e) {
+  if (e.style.display == "none") {
+     e.style.display="";
+  } else {
+     e.style.display = "none";
+ }
+}
+</SCRIPT>
+EEE
+;
 		print end_html;
 	}
 	$dbh->disconnect;