--- db/prgsrc/db.cgi	2001/11/25 23:40:27	1.36
+++ db/prgsrc/db.cgi	2001/11/26 10:31:49	1.37
@@ -7,10 +7,10 @@ use strict;
 use Time::Local;
 use POSIX qw(locale_h);
 use locale;
-open STDERR, ">errors";
-my $printqueries=1;
+#open STDERR, ">errors";
+my $printqueries=0;
 my %forbidden=();
-my $debug=1; #added by R7
+my $debug=0; #added by R7
 my %fieldname= (0,'Question', 1, 'Answer', 2, 'Comments', 3, 'Authors', 4, 'Sources');
 my %searchin;
 
@@ -33,12 +33,12 @@ my ($ZIP) = "/home/piataev/bin/zip";
 my $DUMPFILE = "/tmp/chgkdump";
 my ($SENDMAIL) = "/usr/sbin/sendmail";
 my ($TMSECS) = 30*24*60*60;
-my (%RevMonths) = 
+my (%RevMonths) =
 	('Jan', '0', 'Feb', '1', 'Mar', '2', 'Apr', '3', 'May', '4', 'Jun', '5',
 	'Jul', '6', 'Aug', '7', 'Sep', '8', 'Oct', '9', 'Nov', '10',
 	'Dec', '11',
 	 'Янв', '0', 'Фев', 1, 'Мар', 2, 'Апр', 3, 'Май', '4',
-	 'Июн', '5', 'Июл', 6, 'Авг', '7', 'Сен', '8', 
+	 'Июн', '5', 'Июл', 6, 'Авг', '7', 'Сен', '8',
 	 'Окт', '9', 'Ноя', '19', 'Дек', '11');
 
 # Determine whether the given time is within 2 months from now.
@@ -93,7 +93,7 @@ sub GetTourQuestions {
 	my ($dbh, $ParentId) = @_;
 	my (@arr, @Questions);
 
-	my ($sth) = $dbh->prepare("SELECT QuestionId FROM Questions 
+	my ($sth) = $dbh->prepare("SELECT QuestionId FROM Questions
 		WHERE ParentId=$ParentId ORDER BY QuestionId");
 
 	$sth->execute;
@@ -146,7 +146,7 @@ $sstr=~tr/йцукенгшщзхъфывапролджэячсмить
             foreach $i (0..$#w) # заполняем массив @nf начальных форм
                            # $nf[$i] -- ссылка на массив возможных
                            # начальных форм словоформы $i
-            {              
+            {
                 $qw= $dbh->quote (uc $w[$i]);
                 $query="  select distinct w2 from nests
                                 where w1=$qw";
@@ -344,18 +344,18 @@ sub Search {
 
 
 ###Simple and advanced query processing. Added by R7
-	if ($metod eq 'simple' || $metod eq 'advanced') 
+	if ($metod eq 'simple' || $metod eq 'advanced')
 	{
           foreach (qw/Question Answer Sources Authors Comments/) {
 		if (param($_)) {
-			push @fields, $_; 
+			push @fields, $_;
 		}
 	   }
 
 	   @fields=(qw/Question Answer Sources Authors Comments/) unless scalar @fields;
 	   my $fields=join ",", @fields;
            my $q=new Text::Query($sstr,
-                 -parse => 'Text::Query::'. 
+                 -parse => 'Text::Query::'.
                    (($metod eq 'simple') ? 'ParseSimple':'ParseAdvanced'),
                  -solve => 'Text::Query::SolveSQL',
                  -build => 'Text::Query::BuildSQLMySQL',
@@ -368,7 +368,7 @@ sub Search {
 
            $sth = $dbh->prepare($query);
          } else
-######   
+######
          {
 
 	  foreach (qw/Question Answer Sources Authors Comments/) {
@@ -387,11 +387,11 @@ sub Search {
 	  } else {
 		$sstr = join " OR $f LIKE ", @sar;
     	  }
-    	  
+
    my $query;
                $query="SELECT QuestionId FROM Questions
 		WHERE $f LIKE $sstr ORDER BY QuestionId";
-	
+
 
 print $query if $printqueries;
 	  $sth = $dbh->prepare($query)
@@ -402,14 +402,14 @@ print $query if $printqueries;
 	while (@arr = $sth->fetchrow) {
 		push @Questions, $arr[0] unless $forbidden{$arr[0]};
 	}
-	
+
 	return @Questions;
 }
 
  # Substitute every letter by a pair (for case insensitive search).
- my (@letters) = qw/аА бБ вВ гГ дД еЕ жЖ зЗ иИ йЙ кК лЛ мМ нН оО 
+ my (@letters) = qw/аА бБ вВ гГ дД еЕ жЖ зЗ иИ йЙ кК лЛ мМ нН оО
  пП рР сС тТ уУ фФ хХ цЦ чЧ шШ щЩ ьЬ ыЫ эЭ юЮ яЯ/;
- 
+
 sub NoCase {
 	my ($sstr) = shift;
 	my ($res);
@@ -443,7 +443,7 @@ print "$query" if $printqueries;
 	   {
 	     push @shablon,"(?:$arr[0])";
 	   }
-           $shablon= join "|", @shablon; 
+           $shablon= join "|", @shablon;
            $shablon=~s/[её]/\[ЕЁ\]/gi;
 #           $shablon=~s/([йцукенгшщзхъфывапролджэячсмитьбюЙЦУКЕНГШЩЗХЪФЫВАПРОЛДЖЭЯЧСМИТЬБЮ])/&NoCase($1)/ge;
            $shablon=qr/$shablon/i;
@@ -457,9 +457,9 @@ print "$query" if $printqueries;
 	} elsif ($hits =~ /1$/) {
 		$suffix = 'е';
 	} else {
-		$suffix = 'я'; 
+		$suffix = 'я';
 	}
-	
+
 	print p({align=>"center"}, "Результаты поиска на " . strong($sstr)
 	. " : $hits попадани$suffix.");
 
@@ -473,7 +473,7 @@ print "$query" if $printqueries;
 	for ($i = 0; $i <= $#Questions; $i++) {
 		$output = &PrintQuestion($dbh, $Questions[$i], 1, $i + 1, 1);
                 if (param('metod') eq 'rus')
-                { 
+                {
 	             $output=~s/\b($shablon)\b/\<strong\>$1\<\/strong\>/gi;
 	        } else {
 		foreach  (@sar) {
@@ -498,10 +498,10 @@ sub PrintRandom {
 	for ($i = 0; $i <= $#Questions; $i++) {
 		# Passing DB handler, question ID, print answer, question
 		# number, print title, print text/html
-		$output .= 
+		$output .=
 			&PrintQuestion($dbh, $Questions[$i], 1, $i + 1, 0, $text);
 	}
-	return $output; 
+	return $output;
 }
 
 sub PrintTournament {
@@ -511,7 +511,7 @@ sub PrintTournament {
 	my ($output) = '';
 
 	%Tournament = &GetTournament($dbh, $Id) if ($Id);
-	
+
 	my ($URL) = $Tournament{'URL'};
 	my ($Info) = $Tournament{'Info'};
 	my ($Copyright) = $Tournament{'Copyright'};
@@ -521,7 +521,7 @@ sub PrintTournament {
 	if ($Id) {
 		for ($Tournament{'Type'}) {
 			/Г/ && do {
-				$output .= h2({align=>"center"}, 
+				$output .= h2({align=>"center"},
 					      "Группа: $Tournament{'Title'} ",
 					      "$Tournament{'PlayedAt'}") . p . "\n";
 				last;
@@ -529,13 +529,13 @@ sub PrintTournament {
 			/Ч/ && do {
 				return &PrintTour($dbh, $Tours[0], $answer)
 					if ($#Tours == 0);
-				
+
 				my $title="Пакет: $Tournament{'Title'}";
 				if ($Tournament{'PlayedAt'}) {
 				    $title .= " $Tournament{'PlayedAt'}";
 				}
 
-				$output .= h2({align=>"center"}, 
+				$output .= h2({align=>"center"},
 					"$title") . p . "\n";
 				last;
 			};
@@ -548,9 +548,9 @@ sub PrintTournament {
 		$output .= h2("Банк Вопросов: $qnum вопросов") . p . "\n";
 	}
 
-	for ($i = 0; $i <= $#Tours; $i++) { 
+	for ($i = 0; $i <= $#Tours; $i++) {
 		%Tournament = &GetTournament($dbh, $Tours[$i]);
-		
+
 		if ($Tournament{'Type'} =~ /Ч/) {
 			$SingleTour = 0;
 			my (@Tours) = &GetTours($dbh, $Tournament{'Id'});
@@ -574,7 +574,7 @@ sub PrintTournament {
 		if ($SingleTour or $Tournament{'Type'} =~ /Т/) {
 			$list .= dd(img({src=>$imgsrc, alt=>$alt})
 				. " " . $Tournament{'Title'} . " " .
-				    $Tournament{'PlayedAt'} . $qnum) . 
+				    $Tournament{'PlayedAt'} . $qnum) .
 				dl(
 					dd("["
 						. a({href=>url .  "?tour=$Tournament{'Id'}&answer=0"},
@@ -583,11 +583,11 @@ sub PrintTournament {
                   "вопросы + ответы") . "]")
 				);
 		} else {
-			$list .= dd(a({href=>url . "?tour=$Tournament{'Id'}&comp=1"}, 
+			$list .= dd(a({href=>url . "?tour=$Tournament{'Id'}&comp=1"},
 				img({src=>'/icons/compressed.gif', alt=>'[ZIP]', border=>1}))
-				. " " . img({src=>$imgsrc, alt=>$alt}) 
-				. " " . a({href=>url . "?tour=$Tournament{'Id'}&answer=0"}, 
-				$Tournament{'Title'}. " ". 
+				. " " . img({src=>$imgsrc, alt=>$alt})
+				. " " . a({href=>url . "?tour=$Tournament{'Id'}&answer=0"},
+				$Tournament{'Title'}. " ".
 					  $Tournament{'PlayedAt'}) . $qnum);
 		}
 	}
@@ -595,7 +595,7 @@ sub PrintTournament {
 
 	if ($URL) {
 		$output .=
-		p("Дополнительная информация об этом турнире - по адресу " . 
+		p("Дополнительная информация об этом турнире - по адресу " .
 			a({-'href'=>$URL}, $URL));
 	}
 
@@ -606,7 +606,7 @@ sub PrintTournament {
 	if ($Info) {
 		$output .= p($Info);
 	}
-	
+
 	return $output;
 }
 
@@ -620,7 +620,7 @@ sub Suffix {
 
 sub IsTour {
 	my ($dbh, $Id) = @_;
-	my ($sth) = $dbh->prepare("SELECT Type FROM Tournaments 
+	my ($sth) = $dbh->prepare("SELECT Type FROM Tournaments
 		WHERE Id=$Id");
 	$sth->execute;
 	return ($sth->fetchrow)[0] =~ /Т/;
@@ -640,23 +640,23 @@ sub PrintTour {
 		if ($Tour{'Type'} !~ /Т/);
 
 	my ($qnum) = $Tour{'QuestionsNum'};
-	my ($suffix) = &Suffix($qnum); 
-	
-	$output .= h2({align=>"center"}, $Tournament{"Title"}, 
+	my ($suffix) = &Suffix($qnum);
+
+	$output .= h2({align=>"center"}, $Tournament{"Title"},
 		      $Tournament{'PlayedAt'},
-		      "<br>", $Tour{"Title"} . 
+		      "<br>", $Tour{"Title"} .
 		" ($qnum вопрос$suffix)\n") . p;
 
 	my (@Questions) = &GetTourQuestions($dbh, $Id);
 	for ($q = 0; $q <= $#Questions; $q++) {
 		$output .= &PrintQuestion($dbh, $Questions[$q], $answer, 0);
-	} 
+	}
 
 	$output .= hr({-'align'=>'center', -'width'=>'80%'});
 
 	if ($Tournament{'URL'}) {
 		$output .=
-		p("Дополнительная информация об этом турнире - по адресу " . 
+		p("Дополнительная информация об этом турнире - по адресу " .
 			a({-'href'=>$Tournament{'URL'}}, $Tournament{'URL'}));
 	}
 
@@ -667,26 +667,26 @@ sub PrintTour {
 	if ($Tournament{'Info'}) {
 		$output .= p($Tournament{'Info'});
 	}
-	
+
 
 	if ($answer == 0) {
-		$bottom .= 
+		$bottom .=
 			"[" . a({href=>url . "?tour=$Id&answer=1"}, "ответы") .  "] " . br;
 	}
 	if (&IsTour($dbh, $Id - 1)) {
-		$bottom .= 
-			"[" . a({href=>url . "?tour=" . ($Id - 1) . "&answer=0"}, 
+		$bottom .=
+			"[" . a({href=>url . "?tour=" . ($Id - 1) . "&answer=0"},
 			"предыдущий тур") . "] ";
-		$bottom .= 
-			"[" . a({href=>url . "?tour=" . ($Id - 1) . "&answer=1"}, 
+		$bottom .=
+			"[" . a({href=>url . "?tour=" . ($Id - 1) . "&answer=1"},
 			"предыдущий тур с ответами") . "] " . br;
 	}
 	if (&IsTour($dbh, $Id + 1)) {
-		$bottom .= 
-			"[" . a({href=>url . "?tour=" . ($Id + 1) . "&answer=0"}, 
+		$bottom .=
+			"[" . a({href=>url . "?tour=" . ($Id + 1) . "&answer=0"},
 			"следующий тур") . "] ";
-		$bottom .= 
-			"[" . a({href=>url . "?tour=" . ($Id + 1) . "&answer=1"}, 
+		$bottom .=
+			"[" . a({href=>url . "?tour=" . ($Id + 1) . "&answer=1"},
 			"следующий тур с ответами") . "] ";
 	}
 
@@ -705,11 +705,11 @@ sub PrintField {
 	    $value =~ s/^\|([^\n]*)/<pre>$1<\/pre>/mg;
 	}
 
-	return $text ? "$header:\n$value\n\n" : 
+	return $text ? "$header:\n$value\n\n" :
 		strong("$header: ") . $value . p . "\n";
 }
 
-# Gets a DB handler (ofcourse) and a question Id. Prints 
+# Gets a DB handler (ofcourse) and a question Id. Prints
 # that question, according to the options.
 sub PrintQuestion {
 	my ($dbh, $Id, $answer, $qnum, $title, $text) = @_;
@@ -730,15 +730,15 @@ sub PrintQuestion {
 		}
 		$output .= dl(strong($titles));
 	}
-	
+
 	$qnum = $Question{'Number'}
 		if ($qnum == 0);
 
-	$output .= 
+	$output .=
 		&PrintField("Вопрос $qnum", $Question{'Question'}, $text);
 
 	if ($answer) {
-		$output .= 
+		$output .=
 			&PrintField("Ответ", $Question{'Answer'}, $text);
 
 		if ($Question{'Authors'}) {
@@ -755,15 +755,18 @@ sub PrintQuestion {
 #		        $other.=a({href=>url."?qofauthor=$AuthorId"},"$Name $Surname").". ";
                          $Name=~s/\./\\\./g;
                           my $sha="(?:$Name\\s+$Surname)|(?:$Surname\\s+$Name)|(?:$firstletter\\.\\s*$Surname)|(?:$Surname\\s+$firstletter\\.)|(?:$Surname)|(?:$Name)";
-                          $Nicks=~s/^\|//;
-                          foreach (split /\|/, $Nicks)
+                          if ($Nicks)
                           {
+                            $Nicks=~s/^\|//;
+                            foreach (split /\|/, $Nicks)
+                            {
                               s/\s+/ /g;
                               s/\s+$//;
                               s/ /\\s+/g;
                               s/\./\\\./g;
                               if (s/>$//) {$sha="$sha|(?:$_)"}
                               else        {$sha="(?:$_)|$sha"}
+                            }
                           }
                           $q=~s/($sha)/a({href=>url."?qofauthor=$AuthorId"},$1)/ei;
                       }
@@ -805,7 +808,7 @@ sub Get12Random {
 	my ($qnum) = &GetMaxQId($dbh);
 	my (%chosen);
 	srand;
-	
+
    for ($i = 0; $i < $num; $i++) {
        do {
 	   $q = int(rand($qnum));
@@ -825,7 +828,7 @@ sub Include_virtual {
 
 	open F , $fn
 		or return; #die "Can't open the file $fn: $!\n";
-	
+
 	while (<F>) {
 		if (/<!--#include/o) {
 			s/<!--#include virtual="\/(.*)" -->/&Include_virtual($1)/e;
@@ -844,7 +847,7 @@ sub PrintArchive {
 
 	my (%Tournament) = &GetTournament($dbh, $Id);
 	my (@Tours) = &GetTours($dbh, $Id);
-	
+
 	if ($Tournament{'Type'} =~ /Г/ || $Id == 0) {
 		for ($i = 0; $i <= $#Tours; $i++) {
 			push(@list ,&PrintArchive($dbh, $Tours[$i]));
@@ -860,7 +863,7 @@ sub PrintAll {
 
 	my (%Tournament) = &GetTournament($dbh, $Id);
 	my (@Tours) = &GetTours($dbh, $Id);
-	my ($New) = ($Id and $Tournament{'Type'} eq 'Ч' and 
+	my ($New) = ($Id and $Tournament{'Type'} eq 'Ч' and
 		&NewEnough($Tournament{"CreatedAt"})) ?
 		img({src=>"/znatoki/dimrub/db/new-sml.gif", alt=>"NEW!"}) : "";
 
@@ -882,7 +885,7 @@ sub PrintAll {
 
 sub PrintDates {
 	my ($dbh) = @_;
-	my ($from) = param('from_year') . "-" . param('from_month') . 
+	my ($from) = param('from_year') . "-" . param('from_month') .
 		"-" .  param('from_day');
 	my ($to) = param('to_year') . "-" . param('to_month') . "-" .  param('to_day');
 	$from = $dbh->quote($from);
@@ -913,14 +916,14 @@ sub PrintQOfAuthor
 {
     my ($dbh, $id) = @_;
    $id=$dbh->quote($id);
-    my $sth =  $dbh->prepare("SELECT  Name, Surname FROM Authors WHERE Id=$id");    
+    my $sth =  $dbh->prepare("SELECT  Name, Surname FROM Authors WHERE Id=$id");
     $sth->execute;
     my ($name,$surname)=$sth->fetchrow;
 
-    $sth =  $dbh->prepare("SELECT Question FROM A2Q WHERE Author=$id");    
+    $sth =  $dbh->prepare("SELECT Question FROM A2Q WHERE Author=$id");
     $sth->execute;
     my $q;
-    my @Questions;	
+    my @Questions;
     while (($q)=$sth->fetchrow,$q)
      {push @Questions,$q unless $forbidden{$q}}
 
@@ -931,10 +934,10 @@ sub PrintQOfAuthor
 	} elsif ($hits =~ /1$/) {
 		$suffix = 'е';
 	} else {
-		$suffix = 'я'; 
+		$suffix = 'я';
 	}
-	
-	print p({align=>"center"}, "Автор ".strong("$name $surname. ") 
+
+	print p({align=>"center"}, "Автор ".strong("$name $surname. ")
 	. " : $hits попадани$suffix.");
 
 
@@ -949,56 +952,46 @@ sub PrintAuthors
 {
      my ($dbh,$sort)=@_;
      my($output,$out1,@array,$sth);
-     if ($sort eq 'surname') 
+     if ($sort eq 'surname')
      {
-        $sth = 
-             $dbh->prepare("SELECT Id, Name, Surname, QNumber FROM Authors order by Surname");
-        
-        $output.="<TABLE><CAPTION>Алфавитный список авторов</CAPTION>";
+        $sth =
+             $dbh->prepare("SELECT Id, Name, Surname, QNumber FROM Authors order by Surname, Name");
+     }
+     elsif($sort eq 'name')
+     {
+        $sth =
+             $dbh->prepare("SELECT Id, Name, Surname, QNumber FROM Authors order by Name, Surname");
      }
      else
      {
-        $sth = 
-             $dbh->prepare("SELECT Id, Name, Surname, QNumber FROM Authors Order by QNumber DESC");      
-        $output.="<TABLE>";
+        $sth =
+             $dbh->prepare("SELECT Id, Name, Surname, QNumber FROM Authors Order by QNumber DESC, Surname");
      }
 
+     $output.=h2("Авторы вопросов")."\n";
+     $output.="<TABLE>";
+
+
      $sth->execute;
-     $output.=Tr(th["Фамилия, имя", "Количество вопросов"]);
+     $output.=Tr(th[a({href=>url."?authors=name"},"Имя")
+.", ".
+a({href=>url."?authors=surname"},"фамилия")
+     , a({href=>url."?authors=kvo"},"Количество вопросов")]);
 
      $out1='';
 
      my $ar=$sth->fetchall_arrayref;
 
 
-=head
-     foreach my $arr(@$ar)
-     {
-        $sth = 
-             $dbh->prepare("SELECT count(*) FROM A2Q where Author=".$$arr[0]);      
-        $sth->execute;
-
-        my ($kvo)=$sth->fetchrow;
-
-
 
-        push @$arr, $kvo;
-     }
-
-=cut
-  
-
-#     sort { }@{$ar}
-    
     foreach my $arr(@$ar)
      {
-          
+
            my ($id,$name,$surname,$kvo)=@$arr;
-           if (!$name || !$surname) {print "Opanki at $id\n"} else
+           if (!$name || !$surname) {#print "Opanki at $id\n"
+              } else
            {
-            print  "!";
-
-             my $add=Tr(td([a({href=>"/cgi-bin/db.cgi?qofauthor=$id"},'[Q] ')."$name $surname", $kvo]))."\n";
+             my $add=Tr(td([a({href=>url."?qofauthor=$id"},"$name $surname"), $kvo]))."\n";
              print STDERR $add;
              $output.=$add;
            }
@@ -1008,7 +1001,7 @@ sub PrintAuthors
 }
 
 
-   
+
 MAIN:
 {
 	setlocale(LC_CTYPE,'russian');
@@ -1046,7 +1039,7 @@ if ((uc 'а') ne 'А') {print "Koi8-r loca
 		print header('text/plain');
 	}
 
-        if (param('showequal')) {
+        if (param('hideequal')) {
 	           my ($sth)=  $dbh -> prepare("select first, second FROM equalto");
 	           $sth -> execute;
 	           while ( my  ($first, $second)=$sth -> fetchrow)
@@ -1054,16 +1047,16 @@ if ((uc 'а') ne 'А') {print "Koi8-r loca
                        $forbidden{$first}=1;
                   }
                   $sth->finish;
-        }             
+        }
 
 
 	if (param('rand')) {
 		my ($type, $qnum) = ('', 12);
 		$type .= 'Б' if (param('brain'));
 		$type .= 'Ч' if (param('chgk'));
-		$qnum = param('qnum') if (param('qnum') =~ /^\d+$/);	
+		$qnum = param('qnum') if (param('qnum') =~ /^\d+$/);
 		$qnum = 0 if (!$type);
-		if (param('email') && -x $SENDMAIL && 
+		if (param('email') && -x $SENDMAIL &&
 		open(F, "| $SENDMAIL -t -n")) {
 			my ($Email) = param('email');
 			my ($mime_type) = $text ? "plain" : "html";
@@ -1082,7 +1075,7 @@ EOT
 		} else {
 			print &PrintRandom($dbh, $type, $qnum, $text);
 		}
-	} 
+	}
 	  elsif (param('authors')){
                 print &PrintAuthors($dbh,param('authors'));
         }
@@ -1094,7 +1087,7 @@ EOT
 	} elsif (param('all')) {
 		print &PrintAll($dbh, 0);
 	} elsif (param('from_year') && param('to_year')) {
-		print &PrintDates($dbh);	
+		print &PrintDates($dbh);
 	} elsif (param('comp')) {
 	    print header(
 			 -'Content-Type' => 'application/x-zip-compressed; name="db.zip"',