X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=zebra%2FMakefile;h=889a270cdcb44a3113b224ced856e7c7f1daf5d9;hp=2c1661988ce9b453883a06f9b67cf570f953d260;hb=4e002362222ed9c122c8976ae5d40230aadfdd28;hpb=d0b85c294ef2038d9d88cc403a22cd1a4da58991

diff --git a/zebra/Makefile b/zebra/Makefile
index 2c16619..889a270 100644
--- a/zebra/Makefile
+++ b/zebra/Makefile
@@ -1,9 +1,8 @@
-
-IRSPY_ARCHIVE=		records-2013-08-13
+IRSPY_ARCHIVE=		records-2014-11-24
 IRSPY_ARCHIVE_EXT=	.tar.gz
 DUMP_DIR=		irspy-dump
 ZEBRA_DIR=		db
-ZEBRAIDX=		zebraidx-2.0 
+ZEBRAIDX=		zebraidx-2.0
 ZEBRAIDX_TEST=		zebraidx-2.0 -c zebra-test.cfg
 IRSPY_DATABASE=		$${IRSpyDbName-"localhost:8018/IR-Explain---1"}
 ZEBRA_LOGFILE=		irspy-zebra.log
@@ -46,25 +45,37 @@ dump:
 	-test -e records-${DATE} && mv records-${DATE} records-${DATE}.old
 	mkdir records-${DATE}
 	cd records-${DATE} && ../../bin/irspy-dump.pl ${IRSPY_DATABASE}
-	cd records-${DATE} && ( for i in *.xml; do tidy -xml -i -m -w 140 $$i; done ) > /dev/null 2>&1 
+	#cd records-${DATE}; for i in *.xml; do echo -n "$$i "; tidy -xml -i -m -w 140 $$i 2>&1 | sed 1q; done
 	tar cf - records-${DATE} | gzip > records-${DATE}.tar.gz
-	
+
 clean:
 	rm -f terse.properties
 
-start-zebra:
-	zebrasrv-2.0 -f yazserver.xml > ${ZEBRA_LOGFILE} 2>&1 &
+check-running-zebrasrv:
+	@if zoomsh  -e "open localhost:8018"  "quit" >/dev/null; then \
+	   echo ""; \
+	   echo "There is already a running zebrasrv on localhost:8018"; \
+	   echo "You may need to run: killall zebrasrv-2.0"; \
+	   false; \
+	else \
+	   true; \
+	fi
+
+start-zebra: check-running-zebrasrv
+	zebrasrv-2.0 -f $$(pwd)/yazserver.xml > ${ZEBRA_LOGFILE} 2>&1 &
 
 stop-zebra:
 	kill `cat ${ZEBRA_PID_FILE}`
 	sleep 0.5
 	-kill -9 `cat ${ZEBRA_PID_FILE}`
 
+check: newdb start-zebra dump stop-zebra distclean
+
 distclean: clean
 	rm -rf ${IRSPY_ARCHIVE} ${ZEBRA_DIR} ${ZEBRA_DIR} ${ZEBRA_TEST_DIR} ${ZEBRA_LOGFILE}
 
 help:
-	@echo "make [ dump | test | newdb | newdb-test ]"
+	@echo "make [ newdb | newdb-test | dump | check ]"
 	@echo "     [ start-zebra | stop-zebra ]"
 	@echo "     [ clean | distclean ]"