--- db/prgsrc/Makefile	2008/11/09 19:22:55	1.93
+++ db/prgsrc/Makefile	2010/04/24 21:49:04	1.97
@@ -25,7 +25,7 @@ DESTPRGSRC=~chgk-db/db/prgsrc
 DESTCGIBIN=~chgk-db/public_html/cgi-bin
 DUMPDIR=../dump
 DESTDUMPDIR=/var/tmp/
-TABLES= Questions Tournaments word2question nf nests Authors A2Q equalto
+TABLES= Questions Tournaments word2question nf nests Authors P2Q equalto People P2T
 INDEXWRITER= rubash@yandex.ru, roma7@zaba.ru
 #INDEXWRITER= boris
 AUTHORCHECKER = roma7@zaba.ru
@@ -61,6 +61,8 @@ DBSCRIPTS = mkdb.pl \
 	    checkPBS.pl\
 	    loaddump.pl \
 	    makeauthors.pl\
+	    makeeditors.pl\
+	    makepeople.pl\	    
 	    chronicles.pl\
 	    stats.pl \
 	    validate.pl
@@ -100,8 +102,8 @@ CGIBIN = $(ROOT)/public_html/cgi-bin
 HTMLDIR = $(ROOT)/public_html/dimrub/db
 
 TEXTS = $(wildcard $(SRCDIR)/*.txt) $(SRCDIR)/index
-IMAGES = $(wildcard $(IMAGEDIR)/*)
-SOUNDS = $(wildcard $(SOUNDDIR)/*)
+IMAGES = $(wildcard $(IMAGEDIR)/*.gif) $(wildcard $(IMAGEDIR)/*.jpg)
+SOUNDS = $(wildcard $(SOUNDDIR)/*.mp3) $(wildcard $(SOUNDDIR)/*.mid)
 IMAGENAMES= $(notdir $(IMAGES))
 SOUNDNAMES= $(notdir $(SOUNDS))
 
@@ -209,6 +211,7 @@ dbdeliver: imagedeliver sounddeliver
 	echo "Starting delivering" | mail -s"Starting delivering" $(DELIVERER)
 	mysqldump   --default-character-set=koi8r --add-drop-table -u piataev chgk $(TABLES)  > $(DUMPDIR)/chgkdump
 	echo "delete from hash;" >> $(DUMPDIR)/chgkdump
+	echo "CREATE FULLTEXT INDEX fti ON Questions (Question, Answer, PassCriteria, Comments);" >> $(DUMPDIR)/chgkdump
 	gzip $(DUMPDIR)/chgkdump
 	$(SCP) $(DUMPDIR)/chgkdump.gz  $(KULICHKI):$(DESTDUMPDIR)
 	echo "Delivered" | mail -s"Database delivered" $(DELIVERER)
@@ -226,7 +229,9 @@ $(TIMESTAMP): $(TEXTS)
 	$(DBBIN)/updateindex.pl -i$(SRCDIR)/index
 	$(DBBIN)/updatedb.pl $(SRCDIR)/*.txt 2>&1 | tee $(UPDATELOG)
 	$(DBBIN)/findequal.pl
+	$(DBBIN)/makepeople.pl	
 	$(DBBIN)/makeauthors.pl
+	$(DBBIN)/makeeditors.pl	
 	if [ -s $(UAUTHORS) ]; then  \
 		mail -sUauthors $(AUTHORCHECKER) < $(UAUTHORS); \
 	fi