--- db/prgsrc/Makefile 2006/09/27 19:54:46 1.87 +++ db/prgsrc/Makefile 2008/03/02 05:26:00 1.91 @@ -32,7 +32,7 @@ DELIVERER = roma7@zaba.ru, boris UPDATELOG = $(DUMPDIR)/update.log UAUTHORS=$(DUMPDIR)/uauthors UNSORTED=$(DUMPDIR)/unsorted -RSPARAMS= 2000 75 +RSPARAMS= 2000 150 TIMESTAMP= $(DUMPDIR)/timestamp DBSCRIPTS = mkdb.pl \ @@ -84,6 +84,7 @@ HTMLS = contribute.html \ random.html \ reklama.html \ reklama_bottom.html\ + dbxml.php\ search.html @@ -188,7 +189,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 -u piataev chgk $(TABLES) > $(DUMPDIR)/chgkdump echo "delete from hash;" >> $(DUMPDIR)/chgkdump gzip $(DUMPDIR)/chgkdump $(SCP) $(DUMPDIR)/chgkdump.gz $(KULICHKI):$(DESTDUMPDIR) @@ -235,7 +236,7 @@ dbfill: echo 'ВНИМАНИЕ! Идёт заливка Базы вопросов. \ Результаты поиска в Базе могут быть неполны' \ > ~/public_html/dimrub/db/date;\ - gunzip -c /var/tmp/chgkdump.gz |sed '/LOCK TABLE/d' | mysql -u piataev chgk;\ + gunzip -c /var/tmp/chgkdump.gz | 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; \