--- db/prgsrc/Makefile	2003/05/14 22:35:05	1.60
+++ db/prgsrc/Makefile	2005/03/07 02:37:51	1.78
@@ -15,6 +15,7 @@ IMAGEDIR=$(SRCDIR)/images
 DESTIMAGEDIR=~piataev/public_html/images/db
 INSTALLIMAGEDIR=$(ROOT)/public_html/images/db
 DESTPRGSRC=~piataev/db/prgsrc
+DESTCGIBIN=~piataev/public_html/cgi-bin
 DUMPDIR=../dump
 DESTDUMPDIR=/var/tmp/
 TABLES= Questions Tournaments word2question nf nests Authors A2Q equalto
@@ -27,7 +28,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 \
@@ -53,7 +54,9 @@ DBSCRIPTS = mkdb.pl \
 	    checkPBS.pl\
 	    loaddump.pl \
 	    makeauthors.pl\
-	    chronicles.pl
+	    chronicles.pl\
+	    stats.pl \
+	    validate.pl
 
 LIBS = chgkfiles.pm \
 	    common.pl\
@@ -62,7 +65,8 @@ LIBS = chgkfiles.pm \
             check.pl
 
 
-CGISCRIPTS = db.cgi
+CGISCRIPTS = db.cgi\
+             dbdefs.pl
 
 
 HTMLS = contribute.html \
@@ -226,7 +230,33 @@ dbfill:
 	echo "Starting filling Kulichki database" | mail -s"Starting dbfill" $(DELIVERER)
 	ssh $(KULICHKI) "echo 'ВНИМАНИЕ! Идёт заливка Базы вопросов. \
 				Результаты поиска в Базе могут быть неполны' \
-		> public_html/dimrub/db/date;\
-	 gunzip -c /var/tmp/chgkdump.gz | mysql -u piataev chgk;\
-	 date > public_html/dimrub/db/date "
-	echo "Finished filling Kulichki database" | mail -s"Finished dbfill" $(DELIVERER)
+		> ~/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)
+
+
+