tgz -> tar.gz

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

diff --git a/zebra/Makefile b/zebra/Makefile
index 1d4fe1e..0edf0da 100644 (file)
--- a/zebra/Makefile
+++ b/zebra/Makefile
@@ -3,6 +3,8 @@ IRSPY_ARCHIVE=          records-2010-04-06
 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
 
 # debugging
 ZEBRA_TEST_DIR=                db-test
@@ -21,25 +23,26 @@ terse.properties: pqf.properties
 newdb:
        tar xzf ${DUMP_DIR}/${IRSPY_ARCHIVE}${IRSPY_ARCHIVE_EXT}
        mkdir -p ${ZEBRA_DIR}/lock ${ZEBRA_DIR}/register ${ZEBRA_DIR}/shadow ${ZEBRA_DIR}/tmp
-       zebraidx-2.0 init
-       zebraidx-2.0 update zeerex.xml
-       zebraidx-2.0 update ${IRSPY_ARCHIVE}
-       zebraidx-2.0 commit
+       ${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-2.0 init
-       zebraidx-2.0 update zeerex-test.xml
-       zebraidx-2.0 update ${IRSPY_ARCHIVE}
-       zebraidx-2.0 commit
+       ${ZEBRAIDX_TEST} init
+       ${ZEBRAIDX_TEST} update zeerex-test.xml
+       ${ZEBRAIDX_TEST} update ${IRSPY_ARCHIVE}
+       ${ZEBRAIDX_TEST} commit
 
 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 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 
+       tar cf - records-${DATE} | gzip > records-${DATE}.tar.gz
        
 clean:
        rm -f terse.properties