--- db/prgsrc/Makefile	2003/04/06 17:06:28	1.58
+++ db/prgsrc/Makefile	2003/08/01 17:40:26	1.66
@@ -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
@@ -172,7 +173,7 @@ srcdeliver:
 
 imagedeliver:
 	cvs update $(SRCDIR)
-	$(RSYNC) $(IMAGEDIR) $(KULICHKI):$(DESTIMAGEDIR)
+	$(RSYNC) $(IMAGEDIR)/ $(KULICHKI):$(DESTIMAGEDIR)/
 
 prgdeliver:
 	$(RSYNC) ./ $(KULICHKI):$(DESTPRGSRC)
@@ -181,6 +182,7 @@ 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
+	echo "delete from hash;" >> $(DUMPDIR)/chgkdump
 	gzip $(DUMPDIR)/chgkdump
 	rm $(DUMPDIR)/chgkdump.0
 	$(SCP) $(DUMPDIR)/chgkdump.gz  $(KULICHKI):$(DESTDUMPDIR)
@@ -226,6 +228,14 @@ dbfill:
 	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 '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)