--- db/prgsrc/Makefile	2001/11/21 01:45:03	1.12
+++ db/prgsrc/Makefile	2003/01/09 01:43:21	1.34
@@ -7,11 +7,23 @@ PMODE = 775
 LMODE = 664
 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=/tmp/
+DESTDUMPDIR=/var/tmp/
+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 \
@@ -24,13 +36,17 @@ DBSCRIPTS = mkdb.pl \
 	    renamefile.pl \
 	    makecheck.pl\
 	    mkRS.pl\
+	    delRS.pl\
 	    updateRS.pl\
 	    updateRS1.pl\
+	    updateRS2.pl\
+	    updateRS3.pl\
 	    dumpRS.pl\
 	    dumpin2out.pl\
 	    dump2dump.pl\
 	    checkPBS.pl\
-	    loaddump.pl
+	    loaddump.pl \
+	    makeauthors.pl
 
 LIBS = chgkfiles.pm \
 	    common.pl\
@@ -55,20 +71,21 @@ HTMLS = contribute.html \
 	search.html  
 
 
+TEXTS = $(SRCDIR)/*.txt
 
 
-HTMLDIR = $(ROOT)/public_html/dimrub/db
 DBBIN = ../bin
 MANDIR = ../man
 LIBDIR = ../lib
 CGIBIN = $(ROOT)/public_html/cgi-bin
+HTMLDIR = $(ROOT)/public_html/dimrub/db
 
 BININSTALL =    ${DBSCRIPTS:%=$(DBBIN)/%}
 CGIINSTALL =    ${CGISCRIPTS:%.cgi=$(CGIBIN)/%.cgi}
 LIBINSTALL =    ${LIBS:%=$(LIBDIR)/%}
-HTMLINSTALL = ${HTMLS:%.html=$(HTMLDIR)/%.html}
+HTMLINSTALL =   ${HTMLS:%.html=$(HTMLDIR)/%.html}
 
-all: $(LIBINSTALL) $(BININSTALL) $(CGIINSTALL) 
+all: $(LIBINSTALL) $(BININSTALL) $(CGIINSTALL) $(HTMLINSTALL)
 
 
 $(DBBIN)/%.pl:       %.pl
@@ -130,7 +147,10 @@ $(HTMLDIR)/%.html:       %.html
 	cp $< $@
 
 
+$(UNSORTED): TEXTS
 
+$(SRCDIR)/%.txt:
+	updatedb $<
 
 srcdeliver:
 	$(RSYNC) $(SRCDIR) $(KULICHKI):$(DESTSRCDIR)
@@ -140,7 +160,34 @@ prgdeliver:
 	$(RSYNC) ./ $(KULICHKI):$(DESTPRGSRC)
 
 dbdeliver:
-	mysqldump -u piataev chgk > $(DUMPDIR)/chgkdump
-	$(RSYNC) $(DUMPDIR)/chgkdump  $(KULICHKI):$(DESTDUMPDIR)
-
+	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)
+
+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
+
+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)