X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=zebra%2FMakefile;h=c6a73cbb467fcfec4d54cdf72a628221cb33c6e7;hp=7651c03e0379c99b8d2f63d6c2558e8b7212ca77;hb=bd2f592e1e7cae6c69be6713f0dd2a0d3a210612;hpb=431fcb841e5f2b32f468f32baad454546b76f71a

diff --git a/zebra/Makefile b/zebra/Makefile
index 7651c03..c6a73cb 100644
--- a/zebra/Makefile
+++ b/zebra/Makefile
@@ -1,8 +1,17 @@
 
-IRSPY_ARCHIVE=		records-2010-04-06
+IRSPY_ARCHIVE=		records-2013-08-13
 IRSPY_ARCHIVE_EXT=	.tar.gz
 DUMP_DIR=		irspy-dump
 ZEBRA_DIR=		db
+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
+ZEBRA_PID_FILE=		${ZEBRA_DIR}/lock/zebrasrv.pid
+
+
+# debugging
+ZEBRA_TEST_DIR=		db-test
 
 DATE:=	$(shell date '+%Y-%m-%d')
 
@@ -17,25 +26,48 @@ terse.properties: pqf.properties
 
 newdb:
 	tar xzf ${DUMP_DIR}/${IRSPY_ARCHIVE}${IRSPY_ARCHIVE_EXT}
-	mkdir -p ${ZEBRA_DIR}/lock
-	zebraidx-2.0 init
-	zebraidx-2.0 update zeerex.xml
-	zebraidx-2.0 update ${IRSPY_ARCHIVE}
-	zebraidx-2.0 commit
+	mkdir -p ${ZEBRA_DIR}/lock ${ZEBRA_DIR}/register ${ZEBRA_DIR}/shadow ${ZEBRA_DIR}/tmp
+	${ZEBRAIDX} init
+	${ZEBRAIDX} update zeerex.xml
+	${ZEBRAIDX} update ${IRSPY_ARCHIVE}
+	${ZEBRAIDX} commit
+
+newdb-test:
+	tar xzf ${DUMP_DIR}/${IRSPY_ARCHIVE}${IRSPY_ARCHIVE_EXT}
+	mkdir -p ${ZEBRA_TEST_DIR}/lock ${ZEBRA_TEST_DIR}/register ${ZEBRA_TEST_DIR}/shadow ${ZEBRA_TEST_DIR}/tmp
+	${ZEBRAIDX_TEST} init
+	${ZEBRAIDX_TEST} update zeerex-test.xml
+	${ZEBRAIDX_TEST} update ${IRSPY_ARCHIVE}
+	${ZEBRAIDX_TEST} commit
 
+# note: the test database use localhost:8019/IR-Explain---1
 dump:
 	rm -rf records-${DATE}.old
 	-test -e records-${DATE} && mv records-${DATE} records-${DATE}.old
 	mkdir records-${DATE}
-	cd records-${DATE} && ../../bin/irspy-dump.pl irspy.indexdata.com:8018/IR-Explain---1
-	tar cfz records-${DATE} 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 
+	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 &
+
+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}
+	rm -rf ${IRSPY_ARCHIVE} ${ZEBRA_DIR} ${ZEBRA_DIR} ${ZEBRA_TEST_DIR} ${ZEBRA_LOGFILE}
 
 help:
-	@echo "make [ dump | test | newdb | clean | distclean ]"
+	@echo "make [ newdb | newdb-test | dump | check ]"
+	@echo "     [ start-zebra | stop-zebra ]"
+	@echo "     [ clean | distclean ]"