--- db/prgsrc/Makefile	2003/02/02 21:01:11	1.42
+++ db/prgsrc/Makefile	2003/02/20 17:11:12	1.54
@@ -10,6 +10,7 @@ RSYNC = rsync -ruvptCe ssh --delete --pr
 SCP=scp
 DESTSRCDIR=~piataev/public_html/dimrub/src/
 SRCDIR=../baza
+DICTDIR=../dict
 IMAGEDIR=$(SRCDIR)/images
 DESTIMAGEDIR=~piataev/public_html/images/db
 INSTALLIMAGEDIR=$(ROOT)/public_html/images/db
@@ -46,6 +47,7 @@ DBSCRIPTS = mkdb.pl \
 	    updateRS2.pl\
 	    updateRS3.pl\
 	    dumpRS.pl\
+	    findequal.pl\
 	    dumpin2out.pl\
 	    dump2dump.pl\
 	    checkPBS.pl\
@@ -167,21 +169,26 @@ srcdeliver:
 
 
 imagedeliver:
+	cvs update $(SRCDIR)
 	$(RSYNC) $(IMAGEDIR) $(KULICHKI):$(DESTIMAGEDIR)
 
 prgdeliver:
 	$(RSYNC) ./ $(KULICHKI):$(DESTPRGSRC)
 
 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
 	gzip $(DUMPDIR)/chgkdump
 	rm $(DUMPDIR)/chgkdump.0
 	$(SCP) $(DUMPDIR)/chgkdump.gz  $(KULICHKI):$(DESTDUMPDIR)
-	mail -s"Database delivered" $(DELIVERER)
+	echo "Delivered" | mail -s"Database delivered" $(DELIVERER)
 
 update: 
+	cvs update
 	cvs update $(SRCDIR)
+	cvs update $(DICTDIR)
+	$(MAKE) all
 	$(MAKE) $(TIMESTAMP)
 
 $(TIMESTAMP): $(TEXTS)
@@ -189,7 +196,7 @@ $(TIMESTAMP): $(TEXTS)
 	$(DBBIN)/mkdb.pl
 	$(DBBIN)/updateindex.pl -i$(SRCDIR)/index
 	$(DBBIN)/updatedb.pl $(SRCDIR)/*.txt 2>&1 | tee $(UPDATELOG)
-        $(DBBIN)/findequal.pl
+	$(DBBIN)/findequal.pl
 	$(DBBIN)/makeauthors.pl
 	if [ -s $(UAUTHORS) ]; then  \
 		mail -sUauthors $(AUTHORCHECKER) < $(UAUTHORS); \
@@ -199,7 +206,7 @@ $(TIMESTAMP): $(TEXTS)
 	 else \
 		$(DBBIN)/mkRS.pl; \
 		$(DBBIN)/updateRS2.pl $(RSPARAMS);\
-		mail -s"Ready to deliver" $(DELIVERER);\
+		echo "Ready to deliver" | mail -s"Ready to deliver" $(DELIVERER);\
 	 fi
 	touch $(TIMESTAMP)
 
@@ -211,3 +218,8 @@ authorsdeliver:
 	rm $(DUMPDIR)/chgkdump.0
 	$(SCP) $(DUMPDIR)/chgkdump.gz  $(KULICHKI):$(DESTDUMPDIR)
 
+
+dbfill:
+	echo "Starting filling Kulichki database" | mail -s"Starting dbfill" $(DELIVERER)
+	ssh $(KULICHKI) "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)