--- db/prgsrc/mkRS.pl	2001/10/31 04:38:03	1.3
+++ db/prgsrc/mkRS.pl	2008/02/08 22:49:12	1.9
@@ -32,6 +32,7 @@ cicles_number=1.
 
 =cut
 
+
 use locale;
 use DBI;
 use POSIX qw (locale_h);
@@ -39,42 +40,46 @@ use lib "../lib";
 use chgkfiles;
 use dbchgk;
 my $minstop=2000;
-open (STDERR,">errors");
-do "../bin/common.pl";
-do "../bin/chgk.cnf";
+
+my $DUMPDIR = $ENV{DUMPDIR} || "../dump";
+
+open (STDERR,">$DUMPDIR/errors");
+do "common.pl";
+do "chgk.cnf";
+
 
 die "Undefined \$maxwsize! check your chgk.cnf" unless $maxwsize;
 
-checktable('word2question','delete');
+#checktable('word2question','delete');
 
-checktable('nests','delete');
+#checktable('nests','delete');
 
-checktable('nf','delete');
+#checktable('nf','delete');
 
 
 print "Creating word2question table...\n";
-
+   mydo ("DROP TABLE IF EXISTS word2question");
 	mydo("CREATE TABLE word2question (
 		id     INT UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
                             KEY idkey (id),
 		word   INT UNSIGNED NOT NULL, 
                             KEY wordkey (word),
 		questions  MEDIUMBLOB
-               )"
+               ) type=MyISAM"
             )
 
 	or die "Can't create WORD2QUESTION table: $!\n";
 
 print "Creating nests table...\n";
-
+   mydo ("DROP TABLE IF EXISTS nests");
 	mydo("CREATE TABLE nests (
 		id   INT UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
                             KEY idkey (id),
-		w1   CHAR($maxwsize) BINARY NOT NULL, 
+		w1   CHAR($maxwsize)  CHARACTER SET koi8r COLLATE koi8r_general_ci  NOT NULL, 
                             KEY w1key (w1),
 		w2   INT UNSIGNED NOT NULL,
                             KEY w2key (w2)             
-	)")
+	) type=MyISAM")
 
 	or die "Can't create NESTS table: $!\n";
 
@@ -83,15 +88,16 @@ print "Creating nests table...\n";
 
 print "Creating nf table...\n";
 
+   mydo ("DROP TABLE IF EXISTS nf");
 
 mydo("CREATE TABLE nf (
 		id   INT UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
                     KEY idkey (id),
-		word CHAR(30) BINARY NOT NULL, 
+		word CHAR(30) CHARACTER SET koi8r COLLATE koi8r_general_ci NOT NULL, 
                             KEY wordkey (word),
 	        flag  CHAR(5),
 	        number INT UNSIGNED
-  )") or die "Can't create NF table: $!\n";
+  ) type=MyISAM") or die "Can't create NF table: $!\n";
 
 
 mydo("UPDATE Questions SET ProcessedBySearch=NULL");