Just comment out the tidy invocation. We don't really need it, and it seems to barf...

[irspy-moved-to-github.git] / zebra / Makefile

diff --git a/zebra/Makefile b/zebra/Makefile
index 49ebfa3..889a270 100644 (file)
--- a/zebra/Makefile
+++ b/zebra/Makefile
@@ -1,10 +1,13 @@
-
-IRSPY_ARCHIVE=         records-2010-04-14
+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
+ZEBRA_PID_FILE=                ${ZEBRA_DIR}/lock/zebrasrv.pid
+
 
 # debugging
 ZEBRA_TEST_DIR=                db-test
@@ -36,20 +39,43 @@ newdb-test:
        ${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 localhost:8018/IR-Explain---1
-       cd records-${DATE} && ( for i in *.xml; do tidy -xml -i -m -w 140 $$i; done ) > /dev/null 2>&1 
+       cd records-${DATE} && ../../bin/irspy-dump.pl ${IRSPY_DATABASE}
+       #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
 
+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}
+       rm -rf ${IRSPY_ARCHIVE} ${ZEBRA_DIR} ${ZEBRA_DIR} ${ZEBRA_TEST_DIR} ${ZEBRA_LOGFILE}
 
 help:
-       @echo "make [ dump | test | newdb | newdb-test | clean | distclean ]"
+       @echo "make [ newdb | newdb-test | dump | check ]"
+       @echo "     [ start-zebra | stop-zebra ]"
+       @echo "     [ clean | distclean ]"