--- db/prgsrc/Makefile	2001/11/01 01:44:59	1.11
+++ db/prgsrc/Makefile	2003/01/10 18:55:38	1.39
@@ -7,11 +7,24 @@ 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@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 \
@@ -24,13 +37,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\
@@ -41,17 +58,40 @@ LIBS = chgkfiles.pm \
 
 CGISCRIPTS = db.cgi
 
+
+HTMLS = contribute.html \
+	copyright.html \
+	copyright_mozg.html \
+	credits.html \
+	dbmain.html \
+	footer.html \
+	guestbook.html \
+	index.html \
+	random.html \
+	reklama.html \
+	search.html  
+
+
+TEXTS = $(wildcard $(SRCDIR)/*.txt) $(SRCDIR)/index
+
+
 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}
+
+all: $(LIBINSTALL) $(BININSTALL) $(CGIINSTALL) $(HTMLINSTALL)
 
-all: $(LIBINSTALL) $(BININSTALL) $(CGIINSTALL) 
+install: all
 
+test:
+	echo $(TEXTS)
 
 $(DBBIN)/%.pl:       %.pl
 	${PERL} -c $<
@@ -108,6 +148,8 @@ $(LIBDIR)/%.cnf:       %.cnf
 	if [ -f $(TMPSAV)/$(@F) ]; then rm -f $(TMPSAV)/$(@F); fi
 
 
+$(HTMLDIR)/%.html:       %.html
+	cp $< $@
 
 
 
@@ -119,6 +161,40 @@ 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)
+	mail -s"Database delivered" $(DELIVERER)
+
+update: 
+	cvs update $(SRCDIR)
+	$(MAKE) $(TIMESTAMP)
+
+$(TIMESTAMP): $(TEXTS)
+	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
+	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)