--- db/prgsrc/Makefile	2003/11/13 01:39:39	1.67
+++ db/prgsrc/Makefile	2005/10/15 22:57:21	1.80
@@ -6,7 +6,7 @@ TMPSAV = /tmp
 PMODE = 775
 LMODE = 664
 KULICHKI=znatoki.kulichki.net
-RSYNC = rsync -ruvptCe ssh --delete --progress --rsync-path='~/bin/rsync'
+RSYNC = rsync -ruvptCe ssh --delete --progress 
 SCP=scp
 DESTSRCDIR=~piataev/public_html/dimrub/src/
 SRCDIR=../baza
@@ -28,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 \
@@ -54,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\
@@ -63,7 +65,8 @@ LIBS = chgkfiles.pm \
             check.pl
 
 
-CGISCRIPTS = db.cgi
+CGISCRIPTS = db.cgi\
+             dbdefs.pl
 
 
 HTMLS = contribute.html \
@@ -180,11 +183,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 --add-drop-table -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 +228,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,12 +239,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; \
-		rm -f _timestamp.tmp;  \
+		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)
+
+
+