--- db/prgsrc/Makefile	2003/01/09 01:43:21	1.34
+++ db/prgsrc/Makefile	2003/06/21 18:35:50	1.62
@@ -6,24 +6,30 @@ TMPSAV = /tmp
 PMODE = 775
 LMODE = 664
 KULICHKI=znatoki.kulichki.net
-RSYNC = rsync -ruvpte ssh --delete --progress --rsync-path='~/bin/rsync'
+RSYNC = rsync -ruvptCe ssh --delete --progress --rsync-path='~/bin/rsync'
 SCP=scp
 DESTSRCDIR=~piataev/public_html/dimrub/src/
 SRCDIR=../baza
+DICTDIR=../dict
+IMAGEDIR=$(SRCDIR)/images
+DESTIMAGEDIR=~piataev/public_html/images/db
+INSTALLIMAGEDIR=$(ROOT)/public_html/images/db
 DESTPRGSRC=~piataev/db/prgsrc
+DESTCGIBIN=~piataev/public_html/cgi-bin
 DUMPDIR=../dump
 DESTDUMPDIR=/var/tmp/
-TABLES= Questions Tournaments word2question nf nests Authors A2Q
-INDEXWRITER= rubash@hotbox.ru, roma7@zaba.ru
+TABLES= Questions Tournaments word2question nf nests Authors A2Q equalto
+INDEXWRITER= rubash@yandex.ru, roma7@zaba.ru
 #INDEXWRITER= boris
 AUTHORCHECKER = roma7@zaba.ru
 #AUTHORCHECKER = boris
 DELIVERER = roma7@zaba.ru, boris
-DELIVERER = boris
+#DELIVERER = boris
 UPDATELOG = $(DUMPDIR)/update.log
 UAUTHORS=$(DUMPDIR)/uauthors
 UNSORTED=$(DUMPDIR)/unsorted
-
+RSPARAMS= 2000 50
+TIMESTAMP= $(DUMPDIR)/timestamp
 
 DBSCRIPTS = mkdb.pl \
 	    updatem.pl \
@@ -42,11 +48,13 @@ DBSCRIPTS = mkdb.pl \
 	    updateRS2.pl\
 	    updateRS3.pl\
 	    dumpRS.pl\
+	    findequal.pl\
 	    dumpin2out.pl\
 	    dump2dump.pl\
 	    checkPBS.pl\
 	    loaddump.pl \
-	    makeauthors.pl
+	    makeauthors.pl\
+	    chronicles.pl
 
 LIBS = chgkfiles.pm \
 	    common.pl\
@@ -68,11 +76,10 @@ HTMLS = contribute.html \
 	index.html \
 	random.html \
 	reklama.html \
+	reklama_bottom.html\
 	search.html  
 
 
-TEXTS = $(SRCDIR)/*.txt
-
 
 DBBIN = ../bin
 MANDIR = ../man
@@ -80,12 +87,22 @@ LIBDIR = ../lib
 CGIBIN = $(ROOT)/public_html/cgi-bin
 HTMLDIR = $(ROOT)/public_html/dimrub/db
 
+TEXTS = $(wildcard $(SRCDIR)/*.txt) $(SRCDIR)/index
+IMAGES = $(wildcard $(IMAGEDIR)/*.jpg)
+IMAGENAMES= $(notdir $(IMAGES))
+
+
+
 BININSTALL =    ${DBSCRIPTS:%=$(DBBIN)/%}
 CGIINSTALL =    ${CGISCRIPTS:%.cgi=$(CGIBIN)/%.cgi}
 LIBINSTALL =    ${LIBS:%=$(LIBDIR)/%}
 HTMLINSTALL =   ${HTMLS:%.html=$(HTMLDIR)/%.html}
+IMAGEINSTALL =  ${IMAGENAMES:%=$(INSTALLIMAGEDIR)/%}
+
+all: $(LIBINSTALL) $(BININSTALL) $(CGIINSTALL) $(HTMLINSTALL) $(IMAGEINSTALL)
+
+
 
-all: $(LIBINSTALL) $(BININSTALL) $(CGIINSTALL) $(HTMLINSTALL)
 
 
 $(DBBIN)/%.pl:       %.pl
@@ -147,47 +164,74 @@ $(HTMLDIR)/%.html:       %.html
 	cp $< $@
 
 
-$(UNSORTED): TEXTS
-
-$(SRCDIR)/%.txt:
-	updatedb $<
+$(INSTALLIMAGEDIR)/%: $(IMAGEDIR)/%
+	cp $< $@	
 
 srcdeliver:
 	$(RSYNC) $(SRCDIR) $(KULICHKI):$(DESTSRCDIR)
 
 
+imagedeliver:
+	cvs update $(SRCDIR)
+	$(RSYNC) $(IMAGEDIR)/ $(KULICHKI):$(DESTIMAGEDIR)/
+
 prgdeliver:
 	$(RSYNC) ./ $(KULICHKI):$(DESTPRGSRC)
 
-dbdeliver:
+dbdeliver: imagedeliver
+	echo "Starting delivering" | mail -s"Starting delivering" $(DELIVERER)
 	mysqldump --add-drop-table -u piataev chgk $(TABLES)  > $(DUMPDIR)/chgkdump.0
 	sed 's/TYPE=ISAM PACK_KEYS=1//g' $(DUMPDIR)/chgkdump.0 > $(DUMPDIR)/chgkdump
+	echo "delete from hash;" >> $(DUMPDIR)/chgkdump
 	gzip $(DUMPDIR)/chgkdump
 	rm $(DUMPDIR)/chgkdump.0
 	$(SCP) $(DUMPDIR)/chgkdump.gz  $(KULICHKI):$(DESTDUMPDIR)
+	echo "Delivered" | mail -s"Database delivered" $(DELIVERER)
 
 update: 
+	cvs update
 	cvs update $(SRCDIR)
+	cvs update $(DICTDIR)
+	$(MAKE) all
+	$(MAKE) $(TIMESTAMP)
+
+$(TIMESTAMP): $(TEXTS)
 	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
+	$(DBBIN)/mkdb.pl
+	$(DBBIN)/updateindex.pl -i$(SRCDIR)/index
+	$(DBBIN)/updatedb.pl $(SRCDIR)/*.txt 2>&1 | tee $(UPDATELOG)
+	$(DBBIN)/findequal.pl
+	$(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);\
+		$(DBBIN)/mkRS.pl; \
+		$(DBBIN)/updateRS2.pl $(RSPARAMS);\
+		echo "Ready to deliver" | mail -s"Ready to deliver" $(DELIVERER);\
 	 fi
+	touch $(TIMESTAMP)
+
 
 authorsdeliver:
-	mysqldump --add-drop-table -u piataev chgk Authors A2Q  > $(DUMPDIR)/chgkdump.0
+	mysqldump --add-drop-table -u piataev chgk Authors A2Q  equalto > $(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)
 
+
+dbfill:
+	echo "Starting filling Kulichki database" | mail -s"Starting dbfill" $(DELIVERER)
+	ssh $(KULICHKI) "echo 'ВНИМАНИЕ! Идёт заливка Базы вопросов. \
+				Результаты поиска в Базе могут быть неполны' \
+		> public_html/dimrub/db/date;\
+		echo SELECT MAX(CreatedAt)  FROM Tournaments | 
+		mysql --skip-column-names chgk >_timestamp.tmp;\
+		gunzip -c /var/tmp/chgkdump.gz | mysql -u piataev chgk;\
+		date > public_html/dimrub/db/date; \
+		echo makehtml=1 | perl $(DESTCGIBIN)/db.cgi -z; \
+		rm _timestamp.tmp"
+	echo "Finished filling Kulichki database" | mail -s"Finished dbfill" $(DELIVERER)