--- db/prgsrc/Makefile	2005/10/15 22:57:21	1.80
+++ db/prgsrc/Makefile	2006/09/26 23:54:28	1.86
@@ -1,21 +1,25 @@
+HOSTNAME=$(shell hostname)
+ifeq ($(HOSTNAME),bilbo)
+ROOT=/home/znatoki
+endif
 ifndef ROOT
-ROOT = /home/znatoki
+ROOT = $(HOME)
 endif
 PERL = perl
 TMPSAV = /tmp
 PMODE = 775
 LMODE = 664
-KULICHKI=znatoki.kulichki.net
+KULICHKI=chgk-db-boris@ledorub.chgk.info
 RSYNC = rsync -ruvptCe ssh --delete --progress 
 SCP=scp
-DESTSRCDIR=~piataev/public_html/dimrub/src/
+DESTSRCDIR=~chgk-db/public_html/dimrub/src/
 SRCDIR=../baza
 DICTDIR=../dict
 IMAGEDIR=$(SRCDIR)/images
-DESTIMAGEDIR=~piataev/public_html/images/db
+DESTIMAGEDIR=~chgk-db/public_html/images/db
 INSTALLIMAGEDIR=$(ROOT)/public_html/images/db
-DESTPRGSRC=~piataev/db/prgsrc
-DESTCGIBIN=~piataev/public_html/cgi-bin
+DESTPRGSRC=~chgk-db/db/prgsrc
+DESTCGIBIN=~chgk-db/public_html/cgi-bin
 DUMPDIR=../dump
 DESTDUMPDIR=/var/tmp/
 TABLES= Questions Tournaments word2question nf nests Authors A2Q equalto
@@ -102,6 +106,7 @@ LIBINSTALL =    ${LIBS:%=$(LIBDIR)/%}
 HTMLINSTALL =   ${HTMLS:%.html=$(HTMLDIR)/%.html}
 IMAGEINSTALL =  ${IMAGENAMES:%=$(INSTALLIMAGEDIR)/%}
 
+
 all: $(LIBINSTALL) $(BININSTALL) $(CGIINSTALL) $(HTMLINSTALL) $(IMAGEINSTALL)
 
 
@@ -183,7 +188,7 @@ prgdeliver:
 
 dbdeliver: imagedeliver
 	echo "Starting delivering" | mail -s"Starting delivering" $(DELIVERER)
-	mysqldump --add-drop-table -u piataev chgk $(TABLES)  > $(DUMPDIR)/chgkdump
+	mysqldump --default-character-set=koi8r --add-drop-table --compatible=mysql323 -u piataev chgk $(TABLES)  > $(DUMPDIR)/chgkdump
 	echo "delete from hash;" >> $(DUMPDIR)/chgkdump
 	gzip $(DUMPDIR)/chgkdump
 	$(SCP) $(DUMPDIR)/chgkdump.gz  $(KULICHKI):$(DESTDUMPDIR)
@@ -226,19 +231,11 @@ authorsdeliver:
 
 dbfill:
 	echo "Starting filling Kulichki database" | mail -s"Starting dbfill" $(DELIVERER)
-	ssh $(KULICHKI) "echo 'ВНИМАНИЕ! Идёт заливка Базы вопросов. \
+	ssh $(KULICHKI) "export LANG=ru_RU.KOI8-R; \
+	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;  \
+		gunzip -c /var/tmp/chgkdump.gz |sed '/LOCK TABLE/d' | mysql -u piataev chgk;\
 		date > ~/public_html/dimrub/db/date"
 	echo "Finished filling Kulichki database" | mail -s"Finished dbfill" $(DELIVERER); \
 	$(DBBIN)/stats.pl >> $(SRCDIR)/fill.log; \