X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=zebra%2FMakefile;h=0ddd342e2b90bb54e8420da71b34f83b797f528f;hb=1a908ca46c767ce1ece36803c2ea59cf1819974b;hp=c6a73cbb467fcfec4d54cdf72a628221cb33c6e7;hpb=02a9748836eebbea43549f34ba8cf111a972eb7a;p=irspy-moved-to-github.git

diff --git a/zebra/Makefile b/zebra/Makefile
index c6a73cb..0ddd342 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,15 +45,25 @@ 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}; find . -name '*.xml' -print0 | \
-	   xargs -n1 -0 -P4 tidy -xml -i -m -w 140 > /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
+	find records-${DATE} -name '*.xml' -print0 | xargs -n16 -0 -P4 xmllint -format >/dev/null
 	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}`
@@ -62,7 +71,7 @@ stop-zebra:
 	-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}