--- db/prgsrc/Makefile	2002/11/11 08:48:43	1.22
+++ db/prgsrc/Makefile	2003/01/09 01:43:21	1.34
@@ -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@hotbox.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
+
 
 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\
@@ -86,7 +97,7 @@ $(DBBIN)/%.pl:       %.pl
 	cp $< $@
 	chmod $(PMODE) $@
 	if [ -f $(TMPSAV)/$(@F) ]; then rm -f $(TMPSAV)/$(@F); fi
-		
+
 $(CGIBIN)/%.cgi:       %.cgi
 	${PERL} -c $<
 	- pod2man --center "Internet Club DB" $< > $*.1
@@ -155,11 +166,28 @@ dbdeliver:
 	rm $(DUMPDIR)/chgkdump.0
 	$(SCP) $(DUMPDIR)/chgkdump.gz  $(KULICHKI):$(DESTDUMPDIR)
 
-updatecvs:
+update: 
 	cvs update $(SRCDIR)
+	mysql -upiataev chgk <delq.sql
+	${PERL} $(DBBIN)/mkdb.pl
+	${PERL} $(DBBIN)/updateindex.pl -i$(SRCDIR)/index
+	${PERL} $(DBBIN)/updatedb.pl $(SRCDIR)/*.txt 2>&1 | tee $(UPDATELOG)
+	${PERL} $(DBBIN)/makeauthors.pl
+	if [ -s $(UAUTHORS) ]; then  \
+		mail -sUauthors $(AUTHORCHECKER) < $(UAUTHORS); \
+	fi
+	if [ -s $(UNSORTED) ]; then \
+		mail -sUnsorted $(INDEXWRITER) <$(UNSORTED);\
+	 else \
+		 $(PERL) $(DBBIN)/mkRS.pl; \
+		$(PERL) $(DBBIN)/updateRS2.pl 2000 50;\
+		mail -s"Ready to deliver" $(DELIVERER);\
+	 fi
 
-unsorted: updatecvs $(wildcard $(SRCDIR)*.txt)
-	echo $< >>unsorted
+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)
 
-	
-