--- db/prgsrc/Makefile	2006/09/26 23:54:28	1.86
+++ db/prgsrc/Makefile	2006/11/19 23:58:36	1.89
@@ -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 \
@@ -188,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)
@@ -235,23 +235,9 @@ 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; \
 	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)
-
-
-