--- db/prgsrc/Makefile	2006/02/27 19:11:59	1.81
+++ db/prgsrc/Makefile	2010/04/25 13:08:02	1.98
@@ -1,24 +1,32 @@
+HOSTNAME=$(shell hostname)
+ifeq ($(HOSTNAME),bilbo)
+ROOT=/home/znatoki
+endif
 ifndef ROOT
-ROOT = /home/znatoki
+ROOT = $(HOME)
 endif
 PERL = perl
 TMPSAV = /tmp
 PMODE = 775
 LMODE = 664
-KULICHKI=znatoki.kulichki.net
+KULICHKI=chgk-db-boris@ledorub.chgk.info
 RSYNC = rsync -ruvptCe ssh --delete --progress 
 SCP=scp
-DESTSRCDIR=~piataev/public_html/dimrub/src/
+DESTSRCDIR=~chgk-db/public_html/dimrub/src/
 SRCDIR=../baza
 DICTDIR=../dict
 IMAGEDIR=$(SRCDIR)/images
-DESTIMAGEDIR=~piataev/public_html/images/db
+SOUNDDIR=$(SRCDIR)/sounds
+DESTIMAGEDIR=~chgk-db/public_html/images/db
 INSTALLIMAGEDIR=$(ROOT)/public_html/images/db
-DESTPRGSRC=~piataev/db/prgsrc
-DESTCGIBIN=~piataev/public_html/cgi-bin
+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
 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
@@ -28,7 +36,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 \
@@ -54,6 +62,8 @@ DBSCRIPTS = mkdb.pl \
 	    checkPBS.pl\
 	    loaddump.pl \
 	    makeauthors.pl\
+	    makeeditors.pl\
+	    makepeople.pl\
 	    chronicles.pl\
 	    stats.pl \
 	    validate.pl
@@ -66,7 +76,8 @@ LIBS = chgkfiles.pm \
 
 
 CGISCRIPTS = db.cgi\
-             dbdefs.pl
+             dbdefs.pl \
+             cw.pl
 
 
 HTMLS = contribute.html \
@@ -80,6 +91,7 @@ HTMLS = contribute.html \
 	random.html \
 	reklama.html \
 	reklama_bottom.html\
+	dbxml.php\
 	search.html  
 
 
@@ -91,8 +103,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))
 
 
 
@@ -101,8 +115,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)
 
 
 
@@ -170,6 +187,12 @@ $(HTMLDIR)/%.html:       %.html
 $(INSTALLIMAGEDIR)/%: $(IMAGEDIR)/%
 	cp $< $@	
 
+
+$(INSTALLSOUNDDIR)/%: $(SOUNDDIR)/%
+	cp $< $@	
+
+
+
 srcdeliver:
 	$(RSYNC) $(SRCDIR) $(KULICHKI):$(DESTSRCDIR)
 
@@ -178,15 +201,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 -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
-	sed 's/TYPE=ISAM PACK_KEYS=1//g' $(DUMPDIR)/chgkdump |sed 's/ENGINE=MyISAM DEFAULT CHARSET=koi8r//g' > $(DUMPDIR)/chgkdump1
-	mv $(DUMPDIR)/chgkdump1 $(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)
@@ -204,7 +230,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
@@ -228,35 +256,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)
-
-
-