--- db/prgsrc/Makefile	2006/09/24 19:53:59	1.83
+++ db/prgsrc/Makefile	2006/09/27 21:13:59	1.88
@@ -1,3 +1,7 @@
+HOSTNAME=$(shell hostname)
+ifeq ($(HOSTNAME),bilbo)
+ROOT=/home/znatoki
+endif
 ifndef ROOT
 ROOT = $(HOME)
 endif
@@ -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 --default-character-set=koi8r --add-drop-table --compatible=mysql323 -u piataev chgk $(TABLES)  > $(DUMPDIR)/chgkdump
+	mysqldump  --add-drop-table -u piataev chgk $(TABLES)  > $(DUMPDIR)/chgkdump
 	echo "delete from hash;" >> $(DUMPDIR)/chgkdump
 	gzip $(DUMPDIR)/chgkdump
 	$(SCP) $(DUMPDIR)/chgkdump.gz  $(KULICHKI):$(DESTDUMPDIR)
@@ -226,35 +231,13 @@ 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;  \
 		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)
-
-
-