--- db/prgsrc/Makefile	2006/09/25 16:35:00	1.84
+++ db/prgsrc/Makefile	2010/04/24 17:57:14	1.96
@@ -16,8 +16,11 @@ DESTSRCDIR=~chgk-db/public_html/dimrub/s
 SRCDIR=../baza
 DICTDIR=../dict
 IMAGEDIR=$(SRCDIR)/images
+SOUNDDIR=$(SRCDIR)/sounds
 DESTIMAGEDIR=~chgk-db/public_html/images/db
 INSTALLIMAGEDIR=$(ROOT)/public_html/images/db
+DESTSOUNDDIR=~chgk-db/public_html/sounds/db
+INSTALLSOUNDDIR=$(ROOT)/public_html/sounds/db
 DESTPRGSRC=~chgk-db/db/prgsrc
 DESTCGIBIN=~chgk-db/public_html/cgi-bin
 DUMPDIR=../dump
@@ -32,7 +35,7 @@ DELIVERER = roma7@zaba.ru, boris
 UPDATELOG = $(DUMPDIR)/update.log
 UAUTHORS=$(DUMPDIR)/uauthors
 UNSORTED=$(DUMPDIR)/unsorted
-RSPARAMS= 2000 75
+RSPARAMS= 2000 150
 TIMESTAMP= $(DUMPDIR)/timestamp
 
 DBSCRIPTS = mkdb.pl \
@@ -58,6 +61,8 @@ DBSCRIPTS = mkdb.pl \
 	    checkPBS.pl\
 	    loaddump.pl \
 	    makeauthors.pl\
+	    makeeditors.pl\
+	    makepeople.pl\	    
 	    chronicles.pl\
 	    stats.pl \
 	    validate.pl
@@ -70,7 +75,8 @@ LIBS = chgkfiles.pm \
 
 
 CGISCRIPTS = db.cgi\
-             dbdefs.pl
+             dbdefs.pl \
+             cw.pl
 
 
 HTMLS = contribute.html \
@@ -84,6 +90,7 @@ HTMLS = contribute.html \
 	random.html \
 	reklama.html \
 	reklama_bottom.html\
+	dbxml.php\
 	search.html  
 
 
@@ -95,8 +102,10 @@ CGIBIN = $(ROOT)/public_html/cgi-bin
 HTMLDIR = $(ROOT)/public_html/dimrub/db
 
 TEXTS = $(wildcard $(SRCDIR)/*.txt) $(SRCDIR)/index
-IMAGES = $(wildcard $(IMAGEDIR)/*.jpg)
+IMAGES = $(wildcard $(IMAGEDIR)/*.gif) $(wildcard $(IMAGEDIR)/*.jpg)
+SOUNDS = $(wildcard $(SOUNDDIR)/*.mp3) $(wildcard $(SOUNDDIR)/*.mid)
 IMAGENAMES= $(notdir $(IMAGES))
+SOUNDNAMES= $(notdir $(SOUNDS))
 
 
 
@@ -105,9 +114,11 @@ CGIINSTALL =    ${CGISCRIPTS:%.cgi=$(CGI
 LIBINSTALL =    ${LIBS:%=$(LIBDIR)/%}
 HTMLINSTALL =   ${HTMLS:%.html=$(HTMLDIR)/%.html}
 IMAGEINSTALL =  ${IMAGENAMES:%=$(INSTALLIMAGEDIR)/%}
+SOUNDINSTALL =  ${SOUNDNAMES:%=$(INSTALLSOUNDDIR)/%}
 
 
-all: $(LIBINSTALL) $(BININSTALL) $(CGIINSTALL) $(HTMLINSTALL) $(IMAGEINSTALL)
+all: $(LIBINSTALL) $(BININSTALL) $(CGIINSTALL) $(HTMLINSTALL) \
+	$(IMAGEINSTALL) $(SOUNDINSTALL)
 
 
 
@@ -175,6 +186,12 @@ $(HTMLDIR)/%.html:       %.html
 $(INSTALLIMAGEDIR)/%: $(IMAGEDIR)/%
 	cp $< $@	
 
+
+$(INSTALLSOUNDDIR)/%: $(SOUNDDIR)/%
+	cp $< $@	
+
+
+
 srcdeliver:
 	$(RSYNC) $(SRCDIR) $(KULICHKI):$(DESTSRCDIR)
 
@@ -183,13 +200,18 @@ imagedeliver:
 	cvs update $(SRCDIR)
 	$(RSYNC) $(IMAGEDIR)/ $(KULICHKI):$(DESTIMAGEDIR)/
 
+sounddeliver:
+	cvs update $(SRCDIR)
+	$(RSYNC) $(SOUNDDIR)/ $(KULICHKI):$(DESTSOUNDDIR)/
+
 prgdeliver:
 	$(RSYNC) ./ $(KULICHKI):$(DESTPRGSRC)
 
-dbdeliver: imagedeliver
+dbdeliver: imagedeliver sounddeliver
 	echo "Starting delivering" | mail -s"Starting delivering" $(DELIVERER)
-	mysqldump --default-character-set=koi8r --add-drop-table --compatible=mysql323 -u piataev chgk $(TABLES)  > $(DUMPDIR)/chgkdump
+	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)
@@ -207,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
@@ -231,35 +255,13 @@ authorsdeliver:
 
 dbfill:
 	echo "Starting filling Kulichki database" | mail -s"Starting dbfill" $(DELIVERER)
-	ssh $(KULICHKI) "echo '÷îéíáîéå! éÄ£Ô ÚÁÌÉ×ËÁ âÁÚÙ ×ÏÐÒÏÓÏ×. \
+	ssh $(KULICHKI) "export LANG=ru_RU.KOI8-R; \
+	echo '÷îéíáîéå! éÄ£Ô ÚÁÌÉ×ËÁ âÁÚÙ ×ÏÐÒÏÓÏ×. \
 				òÅÚÕÌØÔÁÔÙ ÐÏÉÓËÁ × âÁÚÅ ÍÏÇÕÔ ÂÙÔØ ÎÅÐÏÌÎÙ' \
 		> ~/public_html/dimrub/db/date;\
-                cd db/prgsrc; \
-		echo 'SELECT MAX(CreatedAt)  FROM Tournaments' | \
-		mysql -u piataev --skip-column-names chgk >_timestamp.tmp;\
 		gunzip -c /var/tmp/chgkdump.gz | mysql -u piataev chgk;\
-		echo makehtml=1 | perl $(DESTCGIBIN)/db.cgi -z; \
-		echo "1900-01-01" > _timestamp.tmp;\
-		echo makehtml=1 | perl $(DESTCGIBIN)/db.cgi -z; \
-		echo "1900-01-01" > _timestamp.tmp;\
-		echo makehtml=1 | perl $(DESTCGIBIN)/db.cgi -z; \
-		rm -f _timestamp.tmp;  \
 		date > ~/public_html/dimrub/db/date"
 	echo "Finished filling Kulichki database" | mail -s"Finished dbfill" $(DELIVERER); \
 	$(DBBIN)/stats.pl >> $(SRCDIR)/fill.log; \
 	cvs commit  -m "Database filled" $(SRCDIR)
 
-regenerate:
-	echo "Starting regenerating Kulichki database" | mail -s"Starting regenerate" $(DELIVERER)
-	ssh $(KULICHKI) "\
-		echo "1900-01-01" > _timestamp.tmp;\
-		echo makehtml=1 | perl $(DESTCGIBIN)/db.cgi -z; \
-		echo "1900-01-01" > _timestamp.tmp;\
-		echo makehtml=1 | perl $(DESTCGIBIN)/db.cgi -z; \
-		echo "1900-01-01" > _timestamp.tmp;\
-		echo makehtml=1 | perl $(DESTCGIBIN)/db.cgi -z; \
-		rm -f _timestamp.tmp;"  \
-	echo "Finished regenerating Kulichki database" | mail -s"Finished regenrate" $(DELIVERER)
-
-
-