--- db/prgsrc/db.cgi 2000/10/15 19:49:22 1.1
+++ db/prgsrc/db.cgi 2001/05/17 03:54:35 1.18
@@ -2,20 +2,26 @@
use DBI;
use CGI ':all';
+use Text::Query;
use strict;
use Time::Local;
use POSIX qw(locale_h);
-
+my $debug=1; #added by R7
+open STDERR, ">errors" if $debug;
my ($PWD) = `pwd`;
chomp $PWD;
my ($SRCPATH) = "$PWD/../dimrub/src";
-my ($ZIP) = "/usr/local/bin/zip";
+my ($ZIP) = "/home/piataev/bin/zip";
+my $DUMPFILE = "/tmp/chgkdump";
my ($SENDMAIL) = "/usr/sbin/sendmail";
my ($TMSECS) = 30*24*60*60;
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');
+ 'Dec', '11',
+ 'ñÎ×', '0', 'æÅ×', 1, 'íÁÒ', 2, 'áÐÒ', 3, 'íÁÊ', '4',
+ 'éÀÎ', '5', 'éÀÌ', 6, 'á×Ç', '7', 'óÅÎ', '8',
+ 'ïËÔ', '9', 'îÏÑ', '19', 'äÅË', '11');
# Determine whether the given time is within 2 months from now.
sub NewEnough {
@@ -101,32 +107,64 @@ sub GetTours {
# Returns list of QuestionId's, that have the search string in them.
sub Search {
- my ($dbh, $sstr) = @_;
+ my ($dbh, $sstr, $metod) = @_;
my (@arr, @Questions, @fields);
- my (@sar, $i, $sth);
+ my (@sar, $i, $sth,$where);
+
+# push @fields, 'Question';
- push @fields, 'Question';
- foreach (qw/Answer Sources Authors Comments/) {
+###Simple and advanced query processing. Added by R7
+ if ($metod eq 'simple' || $metod eq 'advanced')
+ {
+ foreach (qw/Question Answer Sources Authors Comments/) {
if (param($_)) {
- push @fields, "IFNULL($_, '')";
+ push @fields, $_;
}
}
- @sar = split " ", $sstr;
- for $i (0 .. $#sar) {
+ @fields=(qw/Question Answer Sources Authors Comments/) unless scalar @fields;
+ my $fields=join ",", @fields;
+ my $q=new Text::Query($sstr,
+ -parse => 'Text::Query::'.
+ (($metod eq 'simple') ? 'ParseSimple':'ParseAdvanced'),
+ -solve => 'Text::Query::SolveSQL',
+ -build => 'Text::Query::BuildSQLMySQL',
+ -fields_searched => $fields);
+
+ $where= $$q{'matchexp'};
+ my $query= "SELECT Questionid FROM Questions
+ WHERE $where";
+ print br."Query is: $query".br if $debug;
+
+ $sth = $dbh->prepare($query);
+ } else
+######
+ {
+
+
+ foreach (qw/Question Answer Sources Authors Comments/) {
+ if (param($_)) {
+ push @fields, "IFNULL($_, '')";
+ }
+ }
+
+ @sar = split " ", $sstr;
+ for $i (0 .. $#sar) {
$sar[$i] = $dbh->quote("%${sar[$i]}%");
- }
+ }
- my($f) = "CONCAT(" . join(',', @fields) . ")";
- if (param('all') eq 'yes') {
+ my($f) = "CONCAT(" . join(',', @fields) . ")";
+ if (param('all') eq 'yes') {
$sstr = join " AND $f LIKE ", @sar;
- } else {
+ } else {
$sstr = join " OR $f LIKE ", @sar;
- }
+ }
- $sth = $dbh->prepare("SELECT QuestionId FROM Questions
+ $sth = $dbh->prepare("SELECT QuestionId FROM Questions
WHERE $f LIKE $sstr ORDER BY QuestionId");
+ } #else -- processing old-style query (R7)
+
$sth->execute;
while (@arr = $sth->fetchrow) {
push @Questions, $arr[0];
@@ -151,8 +189,8 @@ sub NoCase {
}
sub PrintSearch {
- my ($dbh, $sstr) = @_;
- my (@Questions) = &Search($dbh, $sstr);
+ my ($dbh, $sstr, $metod) = @_;
+ my (@Questions) = &Search($dbh, $sstr,$metod);
my ($output, $i, $suffix, $hits) = ('', 0, '', $#Questions + 1);
if ($hits =~ /1.$/ || $hits =~ /[5-90]$/) {
@@ -172,7 +210,7 @@ sub PrintSearch {
$sstr =~ s/(.)/&NoCase($1)/ge;
- my(@sar) = split(/\s/, $sstr);
+ my(@sar) = split(' ', $sstr);
for ($i = 0; $i <= $#Questions; $i++) {
$output = &PrintQuestion($dbh, $Questions[$i], 1, $i + 1, 1);
foreach (@sar) {
@@ -221,15 +259,21 @@ sub PrintTournament {
for ($Tournament{'Type'}) {
/ç/ && do {
$output .= h2({align=>"center"},
- "çÒÕÐÐÁ: $Tournament{'Title'}") . p . "\n";
+ "çÒÕÐÐÁ: $Tournament{'Title'} ",
+ "$Tournament{'PlayedAt'}") . p . "\n";
last;
};
/þ/ && do {
return &PrintTour($dbh, $Tours[0], $answer)
if ($#Tours == 0);
+
+ my $title="ðÁËÅÔ: $Tournament{'Title'}";
+ if ($Tournament{'PlayedAt'}) {
+ $title .= " $Tournament{'PlayedAt'}";
+ }
$output .= h2({align=>"center"},
- "þÅÍÐÉÏÎÁÔ: $Tournament{'Title'}") . p . "\n";
+ "$title") . p . "\n";
last;
};
/ô/ && do {
@@ -266,7 +310,8 @@ sub PrintTournament {
if ($SingleTour or $Tournament{'Type'} =~ /ô/) {
$list .= dd(img({src=>$imgsrc, alt=>$alt})
- . " " . $Tournament{'Title'} . $qnum) .
+ . " " . $Tournament{'Title'} . " " .
+ $Tournament{'PlayedAt'} . $qnum) .
dl(
dd("["
. a({href=>url . "?tour=$Tournament{'Id'}&answer=0"},
@@ -279,7 +324,8 @@ sub PrintTournament {
img({src=>'/icons/compressed.gif', alt=>'[ZIP]', border=>1}))
. " " . img({src=>$imgsrc, alt=>$alt})
. " " . a({href=>url . "?tour=$Tournament{'Id'}&answer=0"},
- $Tournament{'Title'}) . $qnum);
+ $Tournament{'Title'}. " ".
+ $Tournament{'PlayedAt'}) . $qnum);
}
}
$output .= dl($list);
@@ -333,7 +379,9 @@ sub PrintTour {
my ($qnum) = $Tour{'QuestionsNum'};
my ($suffix) = &Suffix($qnum);
- $output .= h2({align=>"center"}, $Tour{"Title"} .
+ $output .= h2({align=>"center"}, $Tournament{"Title"},
+ $Tournament{'PlayedAt'},
+ "
", $Tour{"Title"} .
" ($qnum ×ÏÐÒÏÓ$suffix)\n") . p;
my (@Questions) = &GetTourQuestions($dbh, $Id);
@@ -388,7 +436,10 @@ sub PrintTour {
sub PrintField {
my ($header, $value, $text) = @_;
if ($text) {
- $value =~ s/<[\/\w]*>//sg;
+ $value =~ s/<[\/\w]*>//sg;
+ } else {
+ $value =~ s/^\s+/
/mg;
+ $value =~ s/^\|([^\n]*)/
$1<\/pre>/mg; } return $text ? "$header:\n$value\n\n" : strong("$header: ") . $value . p . "\n"; @@ -408,7 +459,7 @@ sub PrintQuestion { my (%Tournament) = GetTournament($dbh, $Tour{'ParentId'}); $titles .= dd(img({src=>"/icons/folder.open.gif"}) . " " . - a({href=>url . "?tour=$Tournament{'Id'}"}, $Tournament{'Title'})); + a({href=>url . "?tour=$Tournament{'Id'}"}, $Tournament{'Title'}, $Tournament{'PlayedAt'})); $titles .= dl(dd(img({src=>"/icons/folder.open.gif"}) . " " . a({href=>url . "?tour=$Tour{'Id'}"}, $Tour{'Title'}))); @@ -448,34 +499,40 @@ sub GetQNum { $sth->execute; return ($sth->fetchrow)[0]; } +sub GetMaxQId { + my ($dbh) = @_; + my ($sth) = $dbh->prepare("SELECT MAX(QuestionId) FROM Questions"); + $sth->execute; + return ($sth->fetchrow)[0]; +} # Returns Id's of 12 random questions sub Get12Random { my ($dbh, $type, $num) = @_; my ($i, @questions, $q, $t, $sth); - my ($qnum) = &GetQNum($dbh); + my ($qnum) = &GetMaxQId($dbh); my (%chosen); srand; - for ($i = 0; $i < $num; $i++) { - do { - $q = int(rand($qnum)); - $sth = $dbh->prepare("SELECT Type FROM Questions + for ($i = 0; $i < $num; $i++) { + do { + $q = int(rand($qnum)); + $sth = $dbh->prepare("SELECT Type FROM Questions WHERE QuestionId=$q"); - $sth->execute; - $t = ($sth->fetchrow)[0]; - } until !$chosen{$q} && $t =~ /$type/; - $chosen{$q} = 'y'; - push @questions, $q; - } - return @questions; + $sth->execute; + $t = ($sth->fetchrow)[0]; + } until !$chosen{$q} && $t && $type =~ /[$t]/; + $chosen{$q} = 'y'; + push @questions, $q; + } + return @questions; } sub Include_virtual { my ($fn, $output) = (@_, ''); open F , $fn - or die "Can't open the file $fn: $!\n"; + or return; #die "Can't open the file $fn: $!\n"; while () { if (/