--- db/prgsrc/Makefile 2003/01/12 22:34:09 1.40 +++ db/prgsrc/Makefile 2003/02/07 23:50:49 1.47 @@ -16,7 +16,7 @@ INSTALLIMAGEDIR=$(ROOT)/public_html/imag DESTPRGSRC=~piataev/db/prgsrc DUMPDIR=../dump DESTDUMPDIR=/var/tmp/ -TABLES= Questions Tournaments word2question nf nests Authors A2Q +TABLES= Questions Tournaments word2question nf nests Authors A2Q equalto INDEXWRITER= rubash@yandex.ru, roma7@zaba.ru #INDEXWRITER= boris AUTHORCHECKER = roma7@zaba.ru @@ -46,6 +46,7 @@ DBSCRIPTS = mkdb.pl \ updateRS2.pl\ updateRS3.pl\ dumpRS.pl\ + findequal.pl\ dumpin2out.pl\ dump2dump.pl\ checkPBS.pl\ @@ -167,7 +168,7 @@ srcdeliver: imagedeliver: - $(RSYNC) $(IMAGEDIR)/ $(KULICHKI):$(DESTIMAGEDIR) + $(RSYNC) $(IMAGEDIR) $(KULICHKI):$(DESTIMAGEDIR) prgdeliver: $(RSYNC) ./ $(KULICHKI):$(DESTPRGSRC) @@ -178,7 +179,7 @@ dbdeliver: imagedeliver 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 $(SRCDIR) @@ -189,6 +190,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)/makeauthors.pl if [ -s $(UAUTHORS) ]; then \ mail -sUauthors $(AUTHORCHECKER) < $(UAUTHORS); \ @@ -198,13 +200,13 @@ $(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) authorsdeliver: - mysqldump --add-drop-table -u piataev chgk Authors A2Q > $(DUMPDIR)/chgkdump.0 + mysqldump --add-drop-table -u piataev chgk Authors A2Q equalto > $(DUMPDIR)/chgkdump.0 sed 's/TYPE=ISAM PACK_KEYS=1//g' $(DUMPDIR)/chgkdump.0 > $(DUMPDIR)/chgkdump gzip $(DUMPDIR)/chgkdump rm $(DUMPDIR)/chgkdump.0