--- db/prgsrc/Makefile	2003/08/01 17:40:26	1.66
+++ db/prgsrc/Makefile	2006/09/25 16:35:00	1.84
@@ -1,21 +1,25 @@
+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
-RSYNC = rsync -ruvptCe ssh --delete --progress --rsync-path='~/bin/rsync'
+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
+DESTIMAGEDIR=~chgk-db/public_html/images/db
 INSTALLIMAGEDIR=$(ROOT)/public_html/images/db
-DESTPRGSRC=~piataev/db/prgsrc
-DESTCGIBIN=~piataev/public_html/cgi-bin
+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
@@ -28,7 +32,7 @@ DELIVERER = roma7@zaba.ru, boris
 UPDATELOG = $(DUMPDIR)/update.log
 UAUTHORS=$(DUMPDIR)/uauthors
 UNSORTED=$(DUMPDIR)/unsorted
-RSPARAMS= 2000 50
+RSPARAMS= 2000 75
 TIMESTAMP= $(DUMPDIR)/timestamp
 
 DBSCRIPTS = mkdb.pl \
@@ -54,7 +58,9 @@ DBSCRIPTS = mkdb.pl \
 	    checkPBS.pl\
 	    loaddump.pl \
 	    makeauthors.pl\
-	    chronicles.pl
+	    chronicles.pl\
+	    stats.pl \
+	    validate.pl
 
 LIBS = chgkfiles.pm \
 	    common.pl\
@@ -63,7 +69,8 @@ LIBS = chgkfiles.pm \
             check.pl
 
 
-CGISCRIPTS = db.cgi
+CGISCRIPTS = db.cgi\
+             dbdefs.pl
 
 
 HTMLS = contribute.html \
@@ -99,6 +106,7 @@ LIBINSTALL =    ${LIBS:%=$(LIBDIR)/%}
 HTMLINSTALL =   ${HTMLS:%.html=$(HTMLDIR)/%.html}
 IMAGEINSTALL =  ${IMAGENAMES:%=$(INSTALLIMAGEDIR)/%}
 
+
 all: $(LIBINSTALL) $(BININSTALL) $(CGIINSTALL) $(HTMLINSTALL) $(IMAGEINSTALL)
 
 
@@ -180,11 +188,9 @@ prgdeliver:
 
 dbdeliver: imagedeliver
 	echo "Starting delivering" | mail -s"Starting delivering" $(DELIVERER)
-	mysqldump --add-drop-table -u piataev chgk $(TABLES)  > $(DUMPDIR)/chgkdump.0
-	sed 's/TYPE=ISAM PACK_KEYS=1//g' $(DUMPDIR)/chgkdump.0 > $(DUMPDIR)/chgkdump
+	mysqldump --default-character-set=koi8r --add-drop-table --compatible=mysql323 -u piataev chgk $(TABLES)  > $(DUMPDIR)/chgkdump
 	echo "delete from hash;" >> $(DUMPDIR)/chgkdump
 	gzip $(DUMPDIR)/chgkdump
-	rm $(DUMPDIR)/chgkdump.0
 	$(SCP) $(DUMPDIR)/chgkdump.gz  $(KULICHKI):$(DESTDUMPDIR)
 	echo "Delivered" | mail -s"Database delivered" $(DELIVERER)
 
@@ -227,7 +233,8 @@ dbfill:
 	echo "Starting filling Kulichki database" | mail -s"Starting dbfill" $(DELIVERER)
 	ssh $(KULICHKI) "echo 'ВНИМАНИЕ! Идёт заливка Базы вопросов. \
 				Результаты поиска в Базе могут быть неполны' \
-		> public_html/dimrub/db/date;\
+		> ~/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;\
@@ -237,5 +244,22 @@ dbfill:
 		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)
+		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)
+
+
+