--- db/prgsrc/db.cgi	2003/05/01 20:46:59	1.118
+++ db/prgsrc/db.cgi	2003/06/04 23:18:46	1.120
@@ -450,7 +450,10 @@ sub russearch {
             my %count;
 	POSIX::setlocale( &POSIX::LC_ALL, $thislocale );
 $sstr=~tr/йцукенгшщзхъфывапролджэячсмитьбю/ЙЦУКЕНГШЩЗХЪФЫВАПРОЛДЖЭЯЧСМИТЬБЮ/;
-    	    @qw=@w =split (' ', uc $sstr);
+#    	    @qw=@w =split (' ', uc $sstr);
+            my $ts=uc $sstr;
+      	    @qw=@w= $ts=~m/(?:(?:${RLrl})+)|(?:[A-Za-z0-9]+)/gom;
+
 
 #-----------
             foreach $i (0..$#w) # заполняем массив @nf начальных форм
@@ -1439,13 +1442,13 @@ sub Get12Random {
 
 sub Include_virtual {
 	my ($fn, $output) = (@_, '');
-	return "<!--#include virtual=\"$fn\"-->" if ($opt_z);
+	return "\n<!--#include virtual=\"$fn\"-->\n" if ($opt_z);
 	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;
+			s/<!--#include virtual="\/?([^\/].*)" -->/&Include_virtual($1)/e;
 		}
 		if (/<!--#exec/o) {
 			s/<!--#exec.*cmd\s*=\s*"([^"]*)".*-->/`$1`/e;
@@ -1934,7 +1937,8 @@ th	{font-size: x-small; font-family : sa
         }
 		$tour = (param('tour')) ? param('tour') : 0;
 		my $sth;
-		if ($tour !~ /^[0-9]*$/) {
+		my $texttour=$tour;
+		if ($tour !~ /^[0-9]*$/) {	    
 		    if ($tour=~/\./)
 		    {
 		        my ($fname,$n)= split /\./ , $tour;
@@ -2012,8 +2016,8 @@ EOT
             print "Content-Type: application/octet-stream\n";
             print  "Content-Type: application/force-download\n";
             print  "Content-Type: application/download\n";
-            print  "Content-Type: application/x-zip-compressed; name=db.zip\n";
-            print "Content-Disposition: attachment; filename=db.zip \n\n";
+            print  "Content-Type: application/x-zip-compressed; name=$texttour.zip\n";
+            print "Content-Disposition: attachment; filename=$texttour.zip \n\n";
 	    $tour ||= 0;
 	    my (@files) = &PrintArchive($dbh, $tour);
 	    WriteFile($dbh,$_) foreach @files;