--- db/prgsrc/db.cgi	2002/01/15 03:34:31	1.60
+++ db/prgsrc/db.cgi	2002/06/15 02:20:23	1.69
@@ -110,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;
 
@@ -161,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,
@@ -645,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;
@@ -821,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++) {
@@ -840,6 +841,7 @@ sub PrintTournament {
 			$qnum = '';
 		}
 		if ($Tournament{'Type'} =~ /Г/) {
+		    $SingleTour=0;
 			$imgsrc = "/icons/folder.gif";
 			$alt = "[*]";
 		} else {
@@ -1009,9 +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;
+#	    $value =~ s/(\s)"/$1&#147;/mg;
+#	    $value =~ s/^"/&#147;/mg;
+#	    $value =~ s/"/&#148;/mg;
 	}
 
 
@@ -1025,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) {
@@ -1037,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);
 
@@ -1094,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;
@@ -1650,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;