--- db/prgsrc/Makefile 2004/03/16 01:47:09 1.73 +++ db/prgsrc/Makefile 2005/10/15 22:57:21 1.80 @@ -6,7 +6,7 @@ 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 @@ -54,7 +54,9 @@ DBSCRIPTS = mkdb.pl \ checkPBS.pl\ loaddump.pl \ makeauthors.pl\ - chronicles.pl + chronicles.pl\ + stats.pl \ + validate.pl LIBS = chgkfiles.pm \ common.pl\ @@ -181,11 +183,9 @@ prgdeliver: dbdeliver: imagedeliver echo "Starting delivering" | mail -s"Starting delivering" $(DELIVERER) - mysqldump --add-drop-table -u piataev chgk $(TABLES) > $(DUMPDIR)/chgkdump.0 - sed 's/TYPE=ISAM PACK_KEYS=1//g' $(DUMPDIR)/chgkdump.0 > $(DUMPDIR)/chgkdump + mysqldump --add-drop-table -u piataev chgk $(TABLES) > $(DUMPDIR)/chgkdump echo "delete from hash;" >> $(DUMPDIR)/chgkdump gzip $(DUMPDIR)/chgkdump - rm $(DUMPDIR)/chgkdump.0 $(SCP) $(DUMPDIR)/chgkdump.gz $(KULICHKI):$(DESTDUMPDIR) echo "Delivered" | mail -s"Database delivered" $(DELIVERER) @@ -240,7 +240,9 @@ dbfill: 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) + 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) @@ -253,3 +255,6 @@ regenerate: echo makehtml=1 | perl $(DESTCGIBIN)/db.cgi -z; \ rm -f _timestamp.tmp;" \ echo "Finished regenerating Kulichki database" | mail -s"Finished regenrate" $(DELIVERER) + + +