--- db/prgsrc/Makefile	2003/02/02 21:06:57	1.43
+++ db/prgsrc/Makefile	2006/02/27 19:11:59	1.81
@@ -6,14 +6,16 @@ TMPSAV = /tmp
 PMODE = 775
 LMODE = 664
 KULICHKI=znatoki.kulichki.net
-RSYNC = rsync -ruvptCe ssh --delete --progress --rsync-path='~/bin/rsync'
+RSYNC = rsync -ruvptCe ssh --delete --progress 
 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 equalto
@@ -26,7 +28,7 @@ DELIVERER = roma7@zaba.ru, boris
 UPDATELOG = $(DUMPDIR)/update.log
 UAUTHORS=$(DUMPDIR)/uauthors
 UNSORTED=$(DUMPDIR)/unsorted
-RSPARAMS= 2000 50
+RSPARAMS= 2000 75
 TIMESTAMP= $(DUMPDIR)/timestamp
 
 DBSCRIPTS = mkdb.pl \
@@ -46,11 +48,15 @@ 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\
+	    stats.pl \
+	    validate.pl
 
 LIBS = chgkfiles.pm \
 	    common.pl\
@@ -59,7 +65,8 @@ LIBS = chgkfiles.pm \
             check.pl
 
 
-CGISCRIPTS = db.cgi
+CGISCRIPTS = db.cgi\
+             dbdefs.pl
 
 
 HTMLS = contribute.html \
@@ -72,6 +79,7 @@ HTMLS = contribute.html \
 	index.html \
 	random.html \
 	reklama.html \
+	reklama_bottom.html\
 	search.html  
 
 
@@ -167,21 +175,27 @@ srcdeliver:
 
 
 imagedeliver:
-	$(RSYNC) $(IMAGEDIR) $(KULICHKI):$(DESTIMAGEDIR)
+	cvs update $(SRCDIR)
+	$(RSYNC) $(IMAGEDIR)/ $(KULICHKI):$(DESTIMAGEDIR)/
 
 prgdeliver:
 	$(RSYNC) ./ $(KULICHKI):$(DESTPRGSRC)
 
 dbdeliver: imagedeliver
-	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 "Starting delivering" | mail -s"Starting delivering" $(DELIVERER)
+	mysqldump --default-character-set=koi8r --add-drop-table -u piataev chgk $(TABLES)  > $(DUMPDIR)/chgkdump
+	echo "delete from hash;" >> $(DUMPDIR)/chgkdump
+	sed 's/TYPE=ISAM PACK_KEYS=1//g' $(DUMPDIR)/chgkdump |sed 's/ENGINE=MyISAM DEFAULT CHARSET=koi8r//g' > $(DUMPDIR)/chgkdump1
+	mv $(DUMPDIR)/chgkdump1 $(DUMPDIR)/chgkdump
 	gzip $(DUMPDIR)/chgkdump
-	rm $(DUMPDIR)/chgkdump.0
 	$(SCP) $(DUMPDIR)/chgkdump.gz  $(KULICHKI):$(DESTDUMPDIR)
-	mail -s"Database delivered" $(DELIVERER)
+	echo "Delivered" | mail -s"Database delivered" $(DELIVERER)
 
 update: 
+	cvs update
 	cvs update $(SRCDIR)
+	cvs update $(DICTDIR)
+	$(MAKE) all
 	$(MAKE) $(TIMESTAMP)
 
 $(TIMESTAMP): $(TEXTS)
@@ -199,7 +213,7 @@ $(TIMESTAMP): $(TEXTS)
 	 else \
 		$(DBBIN)/mkRS.pl; \
 		$(DBBIN)/updateRS2.pl $(RSPARAMS);\
-		mail -s"Ready to deliver" $(DELIVERER);\
+		echo "Ready to deliver" | mail -s"Ready to deliver" $(DELIVERER);\
 	 fi
 	touch $(TIMESTAMP)
 
@@ -211,3 +225,38 @@ authorsdeliver:
 	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;\
+                cd db/prgsrc; \
+		echo 'SELECT MAX(CreatedAt)  FROM Tournaments' | \
+		mysql -u piataev --skip-column-names chgk >_timestamp.tmp;\
+		gunzip -c /var/tmp/chgkdump.gz | mysql -u piataev chgk;\
+		echo makehtml=1 | perl $(DESTCGIBIN)/db.cgi -z; \
+		echo "1900-01-01" > _timestamp.tmp;\
+		echo makehtml=1 | perl $(DESTCGIBIN)/db.cgi -z; \
+		echo "1900-01-01" > _timestamp.tmp;\
+		echo makehtml=1 | perl $(DESTCGIBIN)/db.cgi -z; \
+		rm -f _timestamp.tmp;  \
+		date > ~/public_html/dimrub/db/date"
+	echo "Finished filling Kulichki database" | mail -s"Finished dbfill" $(DELIVERER); \
+	$(DBBIN)/stats.pl >> $(SRCDIR)/fill.log; \
+	cvs commit  -m "Database filled" $(SRCDIR)
+
+regenerate:
+	echo "Starting regenerating Kulichki database" | mail -s"Starting regenerate" $(DELIVERER)
+	ssh $(KULICHKI) "\
+		echo "1900-01-01" > _timestamp.tmp;\
+		echo makehtml=1 | perl $(DESTCGIBIN)/db.cgi -z; \
+		echo "1900-01-01" > _timestamp.tmp;\
+		echo makehtml=1 | perl $(DESTCGIBIN)/db.cgi -z; \
+		echo "1900-01-01" > _timestamp.tmp;\
+		echo makehtml=1 | perl $(DESTCGIBIN)/db.cgi -z; \
+		rm -f _timestamp.tmp;"  \
+	echo "Finished regenerating Kulichki database" | mail -s"Finished regenrate" $(DELIVERER)
+
+
+