--- db/prgsrc/db.cgi	2008/11/14 11:23:03	1.150
+++ db/prgsrc/db.cgi	2010/09/24 07:01:52	1.160
@@ -71,7 +71,7 @@ $outputkvo=100 if $outputkvo>100;
 
 if (param('debug')) {$debug=1; $printqueries=1}
 *STDERR=*STDOUT if $debug;
-if ($url !~ /db\.chgk\.info/ && $url !~ /localhost/ && $url !~ /bilbo/ && $url !~ /zaba/ && $url !~ /question\.chgk\.info/ ) {
+if ($url!~ /\/\/db\// && $url !~ /db\.chgk\.info/ && $url !~ /localhost/ && $url !~ /bilbo/ && $url !~ /zaba/ && $url !~ /question\.chgk\.info/ ) {
    my $u="http://db.chgk.info/cgi-bin/db.cgi?$qs";
    Redirect ($u);
    exit;
@@ -214,7 +214,7 @@ sub fetchquestion {
 	if ($WithTour) {
 		($$q{'QuestionId'}, $$q{'Question'},$$q{'Answer'},$$q{'PassCriteria'},$$q{'Comments'},$$q{'Authors'},$$q{'Sources'},
          	$$q{'Number'}, 
-         	$$q{'Title'}, $$q{'TourTitle'}, $$q{'FileName'},$$q{'PlayedAt'},$$q{'TourNumber'}) = 
+         	$$q{'Title'}, $$q{'TourTitle'}, $$q{'FileName'},$$q{'PlayedAt'},$$q{'TourNumber'},$$q{'PlayedAt2'}) = 
 	        $sth->fetchrow;
 	} else {
 		($$q{'QuestionId'}, $$q{'Question'},$$q{'Answer'},$$q{'PassCriteria'},$$q{'Comments'},$$q{'Authors'},$$q{'Sources'},
@@ -233,7 +233,7 @@ sub SelectQuestions {
 #	my $where=join " OR ",@$q;
         my $where=join ',',@$q;
         $where &&= "QuestionId IN (".(join ',',$where).")";
-	$where||=1;
+	$where||=0;
 	$where="($where) AND Questions.ParentId=t1.Id AND t1.ParentId=t2.Id" 
 		if $WithTour;
 
@@ -241,7 +241,7 @@ sub SelectQuestions {
 	if ($WithTour) {
  		$query="SELECT QuestionId, Questions.Question, Answer, PassCriteria, Comments, Authors, Sources,
                         Questions.Number
-			, t2.Title, t1.Title, t2.FileName,  t2.PlayedAt,t1.Number
+			, t2.Title, t1.Title, t2.FileName,  t2.PlayedAt,t1.Number,t2.PlayedAt2
 			from Questions,Tournaments as t1, Tournaments as t2 
                         WHERE $where";
 	} else {
@@ -385,7 +385,7 @@ sub printform
 return   
 <<EOT
 <form method="get" enctype="application/x-www-form-urlencoded"
-action="/znatoki/cgi-bin/db.cgi">
+action="/cgi-bin/db.cgi">
 <h2>Поиск в базе вопросов</h2>
 
 <input type="text" name="sstr" value="$sstr" size="30" maxlength="50"> 
@@ -1092,12 +1092,18 @@ sub PrintTournament {
 	@Tours = &GetTours($dbh, $Id);
 	$list='';
 	my $textid;
+	my $isGroup;
 	if ($Id) {
 		for ($Tournament{'Type'}) {
 			/Г/ && do {
 				$output .= h2({align=>"center"},
 					      "Группа: $Tournament{'Title'} ",
-					      $Tournament{'PlayedAt'}||'') . p . "\n";
+					      $Tournament{'PlayedAt'}||'') . 
+					      ($Tournament{'PlayedAt2'}?'&nbsp;&ndash; '.
+					        $Tournament{'PlayedAt2'}:'') . 
+					      
+					      p . "\n";
+					      $isGroup=1;
 				last;
 			};
 			/Ч/ && do {
@@ -1109,6 +1115,10 @@ sub PrintTournament {
 				    $title .= " $Tournament{'PlayedAt'}";
 				}
 
+				if ($Tournament{'PlayedAt2'}) {
+				    $title .= '&nbsp;&ndash; '.$Tournament{'PlayedAt2'};
+				}
+
 				$output .= h2({align=>"center"},
 					"$title") . p . "\n";
 			       $output.=&PrintEditor(\%Tournament);
@@ -1175,7 +1185,9 @@ sub PrintTournament {
 		if ($SingleTour or ($Tournament{'Type'} =~ /Т/)) {
 			$list .= dd(img({src=>$imgsrc, alt=>$alt})
 				. " " . $Tournament{'Title'} . " " .
-				    ($Tournament{'PlayedAt'}||"") . $qnum) .
+				    ($Tournament{'PlayedAt'}||"") . 
+				    ($Tournament{'PlayedAt2'}?'&nbsp;&ndash; '.$Tournament{'PlayedAt2'}:"") .
+				    $qnum) .
 				dl(
 					dd("["
 						. a({href=>tourhref($textid,0)},
@@ -1191,7 +1203,8 @@ sub PrintTournament {
                                 img({src=>$imgsrc, alt=>$alt})
 				. " " . a({href=>tourhref($textid,0,1)},
 				$Tournament{'Title'}. " ".
-					  ($Tournament{'PlayedAt'}||'')) . $qnum); 
+					  ($Tournament{'PlayedAt'}||'')) .
+					  ($Tournament{'PlayedAt2'}?'&nbsp;&ndash '. $Tournament{'PlayedAt2'}:''). $qnum); 
 		}
 	}
 	$output .= dl($list);
@@ -1212,8 +1225,19 @@ sub PrintTournament {
 		$output .= p($Info);
 	}
 
+
+
 	$output.=p("<a href='/dbxml.php?tour=".param('tour')."'>XML</a>");
-	
+
+		if ($textid=$fname)
+		{
+		   $textid=~s/\.txt//;
+		}
+	if (!$isGroup) {
+  	    $output .= center("<font size='-1'>[".
+	     a({href=>'/v2/print/'.$textid, target=>'_blank'}, 'версия для печати')."] [".
+	     a({href=>'/v2/fb2/'.$textid, target=>'_blank'}, 'fb2')."]"."</font>");
+        }
 	
 	return $output;
 }
@@ -1284,6 +1308,7 @@ sub PrintTour {
 
 	$output .= h2({align=>"center"}, $Tournament{"Title"},
 		      $Tournament{'PlayedAt'}||'',
+		      $Tournament{'PlayedAt2'}?'&nbsp;&ndash; '.$Tournament{'PlayedAt2'}:'',
 		      "<br>\n", $Tour{"Title"} .
 		" ($qnum вопрос$suffix)\n") . p;
 	$output .=&PrintEditor(\%Tour);
@@ -1298,21 +1323,25 @@ sub PrintTour {
 	$output .= hr({-'align'=>'center', -'width'=>'80%'});
 
 	if ($Tournament{'URL'}) {
-		$output .=
-		p("Дополнительная информация об этом турнире - по адресу " .
-			a({-'href'=>$Tournament{'URL'}}, $Tournament{'URL'}));
+	    $URL = $Tournament{'URL'};
+	    $URL=~s/http:\/znatoki\/boris\/reports\//$newsurl/ if $url=~/kulichki/ || $url=~/db.chgk.info/;
+	    $URL=~s/\/znatoki\/boris\/reports\//$newsurl/ if url=~/kulichki/ || $url=~/db.chgk.info/;
+
+	    $output .=
+	    p("Дополнительная информация об этом турнире - по адресу " .
+			a({-'href'=>$URL}, $URL));
 	}
 
 	if ($Tournament{'Copyright'}) {
 		$output .= p("Копирайт: " .   $Tournament{'Copyright'});
 	}
 
-	if ($Tournament{'Info'}) {
+	if ($Tournament{'Info'}  ) {
 		$output .= p($Tournament{'Info'});
 	}
 
-	if ($Tour{'Info'}) {
-		$output .= p($Tour{'Info'});
+	if ($Tour{'Info'} && ($Tournament{'Info'} ne $Tour{'Info'})) {
+		$output .= "!!".p($Tour{'Info'});
 	}
 
 	$output.=p("<a href='/dbxml.php?tour=".param('tour')."'>XML</a>");
@@ -1324,8 +1353,13 @@ sub PrintTour {
 	        
 		$bottom .=
 			"[" . a({href=>tourhref("$fname$nn",1)}, 
-                         "ответы") .  "] " . br."\n";
+                         "ответы") .  "] " 
 	}
+	$bottom .= "[".a({href=>'/v2/print/'.$fname, target=>'_blank'}, 'версия для печати')."] [".
+	  a({href=>'/v2/fb2/'.$fname, target=>'_blank'}, 'fb2')."]".br;
+	
+#	$bottom .= "[".a({href=>'/v2/print/'.$fname.'.'.$Tour{'Number'}, target=>'_blank'}, 'версия для печати')."]".br;
+	
 	if ($n>1) {
 		$bottom .=
 			"[" . a({href=>tourhref("$fname.".($n-1),0)},
@@ -1334,6 +1368,7 @@ sub PrintTour {
 			"[" . a({href=>tourhref("$fname.".($n-1),1)},
 			"предыдущий тур с ответами") . "] " . br."\n";
 	}
+	
 	if (&IsTour($dbh, $Tour{'ParentId'}, $n + 1)) {
 		$bottom .=
 			"[" . a({href=>tourhref("$fname.".($n+1),0)},
@@ -1373,7 +1408,16 @@ sub PrintField {
 			if $value !~ /^\|/;
 	    $value =~ s/^\|([^\n]*)/<pre>$1<\/pre>/mg;
 
-	    $value =~ s/(http:\/\/\S+[^\s\)\(\,\.])/a({href=>escapeUrl($1)},$1)/egm if $header !~ /^Авто/;#!!!
+	    $value =~ s/(http:\/\/\S+[^\s\)\(\,\.\]])/a({href=>escapeUrl($1)},$1)/egm if $header !~ /^Авто/;#!!!
+
+	    $value =~ s/\.\.\.\]/!!!ZAKR!!!/g;
+	    $value =~ s/пропущено\]/!!!PROP!!!/g;
+	    $value =~ s/пропущены\]/!!!PROP2!!!/g;
+	    $value =~ s/\[Раздаточный материал:(.*?)\]\s*\n/<div class='razdatka'><div class='razdatka_header'>Раздаточный материал<\/div> $1<\/div>\n$2/sm;
+	    $value =~ s/<раздатка>(.*?)<\/раздатка>/<div class='razdatka'><div class='razdatka_header'>Раздаточный материал<\/div> $1<\/div>\n/sm;
+	    $value =~ s/!!!ZAKR!!!/\.\.\.\]/g;
+	    $value =~ s/!!!PROP!!!/пропущено\]/g;
+	    $value =~ s/!!!PROP2!!!/пропущены\]/g;
 
 
 #	    $value =~ s/(http:\/\/\S+[^\s\)\(\,\.])/make/eg if $header !~ /^Авто/;#!!!
@@ -1409,6 +1453,7 @@ sub PrintQuestion {
 			$Question{'FileName'}=$Tournament{'FileName'};
 			$Question{'Title'}=$Tournament{'Title'};
 			$Question{'PlayedAt'}=$Tournament{'PlayedAt'};
+			$Question{'PlayedAt2'}=$Tournament{'PlayedAt2'};			
 			$Question{'TourNumber'}=$Tour{'Number'};
 			$Question{'TourTitle'}=$Tour{'Title'};
 		}
@@ -1424,7 +1469,8 @@ sub PrintQuestion {
 			$titles .=
 				dd(img({src=>"/icons/folder.open.gif"}) . " " .
 					 a({href=>tourhref($fname,0,1)}, 
-                               $Question{'Title'}, $Question{'PlayedAt'}||''));
+                               $Question{'Title'}, $Question{'PlayedAt'}||'',
+                               $Question{'PlayedAt2'}?'&nbsp;&ndash; '.$Question{'PlayedAt2'}:''));
 			$titles .=
 				dl(dd(img({src=>"/icons/folder.open.gif"}) . " " .
 					a({href=>tourhref("$fname.$Question{'TourNumber'}#$qnum",1)}, 
@@ -1531,7 +1577,9 @@ EOTT
 $output.="</span>"
 
 	}
-	$output=~s/\(pic: ([^\)]*)\)/<p><img src="\/znatoki\/images\/db\/$1"><p>/g unless $text;
+	$output=~s/\(pic: ([^\)]*)\)/<p><img src="\/znatoki\/images\/db\/$1"><\/p>/g unless $text;
+	$output=~s/\(aud: ([^\)]*)\)/<embed type="application\/x-shockwave-flash" src="http:\/\/www.google.com\/reader\/ui\/3247397568-audio-player.swf?audioUrl=\/znatoki\/sounds\/db\/$1"  allowscriptaccess="never" width="400" height="27" quality="best" bgcolor="#ff0000" wmode="window" flashvars="playerMode=embedded" \/>/g unless $text;
+
 	$output=~s/⌡/\&iuml;/g;
 	$output=~s/⌠/\&Iuml;/g;
 
@@ -1677,7 +1725,9 @@ sub PrintAll {
 
 		$output .= dd(img({src=>"/icons/folder.gif", alt=>"[*]"}) .
       " " . a({href=>tourhref($textid,0,!$SingleTour)},
-      $Tournament{'Title'}) ." " . ($Tournament{'PlayedAt'}||'') . " $New");
+      $Tournament{'Title'}) ." " . ($Tournament{'PlayedAt'}||'') . 
+      ($Tournament{'PlayedAt2'}?'&nbsp;&ndash; '.$Tournament{'PlayedAt2'}:'') . 
+      " $New");
 	}
 	if ($Id == 0 or $Tournament{'Type'} =~ /Г/ or $Tournament{'Type'} eq '') {
 		for ($i = 0; $i <= $#Tours; $i++) {
@@ -1722,7 +1772,8 @@ sub PrintDates {
 	         else {$textid=$Tournament{'Id'}};
       $list .= dd(img({src=>"/icons/folder.gif", alt=>"[*]"}) .
       " " . a({href=>tourhref($textid,0,1)},
-      $Tournament{'Title'}, $Tournament{'PlayedAt'}||''));
+      $Tournament{'Title'}, $Tournament{'PlayedAt'}||'', 
+      $Tournament{'PlayedAt2'}?'&nbsp;&ndash; '.$Tournament{'PlayedAt2'}:''));
 	}
         $sth->finish;
 	$output .= dl($list);
@@ -1839,14 +1890,14 @@ sub WriteFile {
   $fname=~s/.*\/(\w+)/$1/;
 
   my $query= "SELECT Id, Title, Copyright, Info, URL, 
-                      Editors, EnteredBy, PlayedAt, CreatedAt 
+                      Editors, EnteredBy, PlayedAt, CreatedAt, PlayedAt2
                      from Tournaments where FileName=
                      '$fname' OR 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)=
+   $Editors, $EnteredBy, $PlayedAt, $CreatedAt, $PlayedAt2)=
       $sth->fetchrow;
   return -1 unless $Id;
   open (OUT, ">$TMPDIR/$fname.txt") || print STDERR "Error in $fname.txt\n";
@@ -1855,6 +1906,10 @@ sub WriteFile {
   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);
+  if ($PlayedAt2) {
+    my ($year,$month,$day)=split /-/, $date;
+    $pdate .= sprintf(" - %02d-%3s-%4d",$day,$months[$month],$year);    
+  }
 
   print OUT "Дата:\n$pdate\n\n" if $date;
 
@@ -2144,6 +2199,14 @@ MAIN:
 $globaloutput.="<style>
 td	{font-size: x-small; font-family : sans-serif}
 th	{font-size: x-small; font-family : sans-serif}
+div.razdatka { 
+    background-color:#EEEEFF;
+    padding:4px;
+    border:1px solid black;
+}
+
+div.razdatka_header {font-style:italic;}
+
 </style>\n";
 
 		$globaloutput.=&Include_virtual("$reklama")||'';