--- db/prgsrc/Makefile	2002/11/13 22:22:14	1.32
+++ db/prgsrc/Makefile	2003/01/10 18:55:38	1.39
@@ -13,8 +13,18 @@ SRCDIR=../baza
 DESTPRGSRC=~piataev/db/prgsrc
 DUMPDIR=../dump
 DESTDUMPDIR=/var/tmp/
-TABLES= Questions Tournaments word2question nf nests
-INDEXWRITER= rubash@hotbox.ru, roma7@zaba.ru
+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
+TIMESTAMP= $(DUMPDIR)/timestamp
 
 DBSCRIPTS = mkdb.pl \
 	    updatem.pl \
@@ -36,7 +46,8 @@ DBSCRIPTS = mkdb.pl \
 	    dumpin2out.pl\
 	    dump2dump.pl\
 	    checkPBS.pl\
-	    loaddump.pl
+	    loaddump.pl \
+	    makeauthors.pl
 
 LIBS = chgkfiles.pm \
 	    common.pl\
@@ -61,7 +72,7 @@ HTMLS = contribute.html \
 	search.html  
 
 
-TEXTS = $(SRCDIR)/*.txt
+TEXTS = $(wildcard $(SRCDIR)/*.txt) $(SRCDIR)/index
 
 
 DBBIN = ../bin
@@ -77,6 +88,10 @@ HTMLINSTALL =   ${HTMLS:%.html=$(HTMLDIR
 
 all: $(LIBINSTALL) $(BININSTALL) $(CGIINSTALL) $(HTMLINSTALL)
 
+install: all
+
+test:
+	echo $(TEXTS)
 
 $(DBBIN)/%.pl:       %.pl
 	${PERL} -c $<
@@ -87,7 +102,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
@@ -137,10 +152,6 @@ $(HTMLDIR)/%.html:       %.html
 	cp $< $@
 
 
-$(UNSORTED): TEXTS
-
-$(SRCDIR)/%.txt:
-	updatedb $<
 
 srcdeliver:
 	$(RSYNC) $(SRCDIR) $(KULICHKI):$(DESTSRCDIR)
@@ -155,14 +166,35 @@ dbdeliver:
 	gzip $(DUMPDIR)/chgkdump
 	rm $(DUMPDIR)/chgkdump.0
 	$(SCP) $(DUMPDIR)/chgkdump.gz  $(KULICHKI):$(DESTDUMPDIR)
+	mail -s"Database delivered" $(DELIVERER)
 
 update: 
 	cvs update $(SRCDIR)
+	$(MAKE) $(TIMESTAMP)
+
+$(TIMESTAMP): $(TEXTS)
 	mysql -upiataev chgk <delq.sql
-	${PERL} mkdb.pl
-	${PERL} updateindex.pl -i$(SRCDIR)/index
-	${PERL} updatedb.pl $(SRCDIR)/*.txt
-	if [ -f unsorted ]; then mail -sUnsorted $(INDEXWRITER) <unsorted; else sh updateRS.sh; fi
-	
-	
-	
+	$(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
+	touch $(TIMESTAMP)
+
+
+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)
+