--- db/prgsrc/Makefile	2002/11/11 08:30:37	1.19
+++ db/prgsrc/Makefile	2003/01/09 19:38:33	1.38
@@ -9,11 +9,21 @@ KULICHKI=znatoki.kulichki.net
 RSYNC = rsync -ruvpte ssh --delete --progress --rsync-path='~/bin/rsync'
 SCP=scp
 DESTSRCDIR=~piataev/public_html/dimrub/src/
-SRCDIR=../baza/
+SRCDIR=../baza
 DESTPRGSRC=~piataev/db/prgsrc
 DUMPDIR=../dump
 DESTDUMPDIR=/var/tmp/
-TABLES= Questions Tournaments word2question nf nests
+TABLES= Questions Tournaments word2question nf nests Authors A2Q
+INDEXWRITER= rubash@yandex.ru, roma7@zaba.ru
+#INDEXWRITER= boris
+AUTHORCHECKER = roma7@zaba.ru
+#AUTHORCHECKER = boris
+DELIVERER = roma7@zaba.ru, boris
+#DELIVERER = boris
+UPDATELOG = $(DUMPDIR)/update.log
+UAUTHORS=$(DUMPDIR)/uauthors
+UNSORTED=$(DUMPDIR)/unsorted
+RSPARAMS= 2000 50
 
 DBSCRIPTS = mkdb.pl \
 	    updatem.pl \
@@ -35,7 +45,8 @@ DBSCRIPTS = mkdb.pl \
 	    dumpin2out.pl\
 	    dump2dump.pl\
 	    checkPBS.pl\
-	    loaddump.pl
+	    loaddump.pl \
+	    makeauthors.pl
 
 LIBS = chgkfiles.pm \
 	    common.pl\
@@ -154,10 +165,30 @@ dbdeliver:
 	gzip $(DUMPDIR)/chgkdump
 	rm $(DUMPDIR)/chgkdump.0
 	$(SCP) $(DUMPDIR)/chgkdump.gz  $(KULICHKI):$(DESTDUMPDIR)
+	mail -s"Database delivered" $(DELIVERER)
 
-updatecvs:
-	cd ($SRCDIR)
-	cvs update
+update: 
+	cvs update $(SRCDIR)
+	mysql -upiataev chgk <delq.sql
+	$(DBBIN)/mkdb.pl
+	$(DBBIN)/updateindex.pl -i$(SRCDIR)/index
+	$(DBBIN)/updatedb.pl $(SRCDIR)/*.txt 2>&1 | tee $(UPDATELOG)
+	$(DBBIN)/makeauthors.pl
+	if [ -s $(UAUTHORS) ]; then  \
+		mail -sUauthors $(AUTHORCHECKER) < $(UAUTHORS); \
+	fi
+	if [ -s $(UNSORTED) ]; then \
+		mail -sUnsorted $(INDEXWRITER) <$(UNSORTED);\
+	 else \
+		$(DBBIN)/mkRS.pl; \
+		$(DBBIN)/updateRS2.pl $(RSPARAMS);\
+		mail -s"Ready to deliver" $(DELIVERER);\
+	 fi
+
+authorsdeliver:
+	mysqldump --add-drop-table -u piataev chgk Authors A2Q  > $(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)
 
-	
-