--- db/prgsrc/db.cgi	2004/09/05 14:57:05	1.136
+++ db/prgsrc/db.cgi	2005/02/26 11:03:41	1.139
@@ -11,8 +11,9 @@ use locale;
 use vars qw($opt_z);
 use Getopt::Std;
 #my ($dbuser,$dbname,$dbpass,$dbhost);
-require "dbdefs.pl";
+eval {require "dbdefs.pl";} ;
 my $url=url||'';
+my @used_stop=();
 $dbuser||="piataev";
 $dbname||="chgk";
 $dbpass||="";
@@ -500,19 +501,31 @@ sub russearch {
             my %relevance;
             my @blob;
             my %count;
+            my %stop_word;
 	POSIX::setlocale( &POSIX::LC_ALL, $thislocale );
 $sstr=~tr/йцукенгшщзхъфывапролджэячсмитьбю/ЙЦУКЕНГШЩЗХЪФЫВАПРОЛДЖЭЯЧСМИТЬБЮ/;
 #    	    @qw=@w =split (' ', uc $sstr);
             my $ts=uc $sstr;
       	    @qw=@w= $ts=~m/(?:(?:${RLrl})+)|(?:[A-Za-z0-9]+)/gom;
-
+            $query="select nf.word from nf  where number>=50000";
+            $sth=$dbh->prepare($query);
+            $sth->execute();
+	    %stop_word=();
+	    while (@arr = $sth->fetchrow)
+	        {
+	           $stop_word{$arr[0]}=1;
+	        }
+                $sth->finish;
+    	    
 
 #-----------
             foreach $i (0..$#w) # заполняем массив @nf начальных форм
                            # $nf[$i] -- ссылка на массив возможных
                            # начальных форм словоформы $i
             {
+                (push @used_stop, uc $w[$i]),next if $stop_word{uc $w[$i]};
                 $qw= $dbh->quote (uc $w[$i]);
+
                 $query="  select distinct w2 from nests
                                 where w1=$qw";
                 $sth=$dbh -> prepare($query);
@@ -557,7 +570,7 @@ $sstr=~tr/йцукенгшщзхъфывапролджэячсмить
               $_= " word2question.word=$_" foreach @arr;
               $_= " nf.id=".$_. ' ' foreach @arr1;
 #              @arr=(0) unless @arr;
-              $query="select questions from word2question where (". (join ' OR ', @arr).") AND length(questions)<80000";
+              $query="select questions from word2question where (". (join ' OR ', @arr).") ";
 
     	      $sth=$dbh -> prepare($query);
               $sth->execute;
@@ -891,7 +904,7 @@ sub PrintList {
 	for (my $i = $first; $i <= $last; $i++) {
 		my $q=$q{$$Questions[$i-1]};
 	        my $output;
-		$output = &PrintQuestion($dbh, $q, 1, 0, 1,0,1  );
+		$output = &PrintQuestion($dbh, $q, 1, 0, 1,$text,1  );
 #                if (param('metod') && (param('metod') eq 'rus' || param('metod') eq 'proxy'))
                 {
 	             $output=~s/\b($shablon)\b/\<strong\>$1\<\/strong\>/gi;
@@ -945,6 +958,8 @@ sub PrintSearch {
 
 
 	$Output.= p. "Время поиска: " . (time-$t) ." сек.".p;
+	$_="\"$_\"" foreach @used_stop;
+	$Output.= p. (join ', ',@used_stop) ." ignored".p if @used_stop;
 	my ($output, $i, $suffix, $hits) = ('', 0, '', $#Questions + 1);
 
         my $shablon;
@@ -1263,7 +1278,7 @@ sub PrintTour {
 	my $sth=SelectQuestions($dbh,\@Questions,0);
 	for ($q = 0; $q <= $#Questions; $q++) {
 		fetchquestion($sth,\%q,0);
-		$output .= &PrintQuestion($dbh, \%q, $answer, 0,0,0,1);
+		$output .= &PrintQuestion($dbh, \%q, $answer, 0,0,$text,1);
 	}
 	$sth->finish;
 	$output .= hr({-'align'=>'center', -'width'=>'80%'});
@@ -1484,6 +1499,9 @@ $output.="</span>"
 
 	}
 	$output=~s/\(pic: ([^\)]*)\)/<p><img src="\/znatoki\/images\/db\/$1"><p>/g unless $text;
+	$output=~s/⌡/\&iuml;/g;
+	$output=~s/⌠/\&Iuml;/g;
+
 	$paramtour||=param("tour");
 	$fname=$fname.".$Question{'TourNumber'}" if $fname && $Question{'TourNumber'};
 $fname||=param('tour');
@@ -2214,7 +2232,7 @@ EOT
 		  $QuestionNumber=($sth->fetchrow)[0]||0;
 	        }
 	        if ($QuestionNumber) {
-		  $globaloutput.= &PrintQuestion($dbh, $QuestionNumber, $withanswers||0, $qnum, 1,0,0);
+		  $globaloutput.= &PrintQuestion($dbh, $QuestionNumber, $withanswers||0, $qnum, 1,$text,0);
 #                                        $dbh, $Id, $answer, $qnum, $title, $text
 		} else  {
   		   $globaloutput.=&PrintTournament($dbh, $tour, $withanswers);