From 2fce83d6949f3117dfa6591cf6e9351a111b6ae1 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 2 Dec 2004 12:08:39 +0000
Subject: [PATCH] Remove unused stuff

---
 test/xpath/Makefile.am |    5 +----
 test/xpath/Zthes.abs   |    7 -------
 test/xpath/rec.xml     |   40 --------------------------------------
 test/xpath/rec4.xml    |    7 -------
 test/xpath/rec5.xml    |   26 -------------------------
 test/xpath/simple1.sh  |   28 ---------------------------
 test/xpath/simple1.xml |    9 ---------
 test/xpath/test1.sh    |    9 ---------
 test/xpath/test2.sh    |   23 ----------------------
 test/xpath/test3.sh    |   23 ----------------------
 test/xpath/test4.sh    |   40 --------------------------------------
 test/xpath/test5.sh    |   50 ------------------------------------------------
 test/xpath/zebra.cfg   |   10 ----------
 test/xpath/zthes-b.est |    2 --
 14 files changed, 1 insertion(+), 278 deletions(-)
 delete mode 100644 test/xpath/Zthes.abs
 delete mode 100644 test/xpath/rec.xml
 delete mode 100644 test/xpath/rec4.xml
 delete mode 100644 test/xpath/rec5.xml
 delete mode 100755 test/xpath/simple1.sh
 delete mode 100644 test/xpath/simple1.xml
 delete mode 100755 test/xpath/test1.sh
 delete mode 100755 test/xpath/test2.sh
 delete mode 100755 test/xpath/test3.sh
 delete mode 100755 test/xpath/test4.sh
 delete mode 100755 test/xpath/test5.sh
 delete mode 100644 test/xpath/zebra.cfg
 delete mode 100644 test/xpath/zthes-b.est

diff --git a/test/xpath/Makefile.am b/test/xpath/Makefile.am
index 2508918..8bdf1ee 100644
--- a/test/xpath/Makefile.am
+++ b/test/xpath/Makefile.am
@@ -1,10 +1,7 @@
-# $Id: Makefile.am,v 1.8 2004-11-19 10:27:17 heikki Exp $
+# $Id: Makefile.am,v 1.9 2004-12-02 12:08:39 adam Exp $
 
 check_SCRIPTS = dummy.sh
-#check_SCRIPTS = simple1.sh test1.sh test2.sh test3.sh test4.sh test5.sh
 
 TESTS = $(check_SCRIPTS)
 
-#EXTRA_DIST = zebra.cfg rec.xml Zthes.abs zthes-b.est \
-# simple1.xml rec4.xml rec5.xml $(check_SCRIPTS)
 
diff --git a/test/xpath/Zthes.abs b/test/xpath/Zthes.abs
deleted file mode 100644
index 83c297e..0000000
--- a/test/xpath/Zthes.abs
+++ /dev/null
@@ -1,7 +0,0 @@
-attset bib1.att
-tagset tagsetg.tag
-xpath enable
-
-esetname F @
-esetname B zthes-b.est
-
diff --git a/test/xpath/rec.xml b/test/xpath/rec.xml
deleted file mode 100644
index 16afce8..0000000
--- a/test/xpath/rec.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<Zthes>
- <termId>10</termId>
- <termName>Sauropoda</termName>
- <termType>PT</termType>
- <relation>
-  <relationType>BT</relationType>
-  <termId>5</termId>
-  <termName>Brontosauria</termName>
-  <termType>PT</termType>
- </relation>
- <relation>
-  <relationType>NT</relationType>
-  <termId>11</termId>
-  <termName>Eusauropoda</termName>
-  <termType>PT</termType>
- </relation>
-</Zthes>
-<Zthes>
- <termId>5</termId>
- <termName>Brontosauria</termName>
- <termType>PT</termType>
- <relation>
-  <relationType>BT</relationType>
-  <termId>4</termId>
-  <termName>Sauropodomorpha</termName>
-  <termType>PT</termType>
- </relation>
- <relation>
-  <relationType>NT</relationType>
-  <termId>6</termId>
-  <termName>Plateosauria</termName>
-  <termType>PT</termType>
- </relation>
- <relation>
-  <relationType>NT</relationType>
-  <termId>10</termId>
-  <termName>Sauropoda</termName>
-  <termType>PT</termType>
- </relation>
-</Zthes>
diff --git a/test/xpath/rec4.xml b/test/xpath/rec4.xml
deleted file mode 100644
index 3deac13..0000000
--- a/test/xpath/rec4.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<root>
-  <!-- Space in attribute -->
-  <first attr="danish">content</first>
-  <second attr="danish lake">content</second>
-  <!-- Oslash in Latin-1 encoded below.. -->
-  <third attr="dansk sø">content<third>
-</root>
diff --git a/test/xpath/rec5.xml b/test/xpath/rec5.xml
deleted file mode 100644
index 57eea27..0000000
--- a/test/xpath/rec5.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<record>
-  <title>foo</title>
-  <title>bar</title>
-  <author>gryf</author>
-</record>
-
-<record>
-  <title>foo bar</title>
-  <author>gryf</author>
-</record>
-
-<record>
-  <title lang=en>foo gryf</title>
-  <author>grunt</author>
-</record>
-
-<record>
-  <title lang=da>foo grunt</title>
-  <value>bar</value>
-</record>
-
-<record>
-  <title>hamlet</title>
-  <author>foo bar grunt</author>
-</record>
-  
diff --git a/test/xpath/simple1.sh b/test/xpath/simple1.sh
deleted file mode 100755
index 3d4d940..0000000
--- a/test/xpath/simple1.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-# $Id: simple1.sh,v 1.4 2004-06-15 09:43:34 adam Exp $
-# test with one simple sgml record
-
-pp=${srcdir:-"."}
-
-LOG=simple1.log
-../../index/zebraidx -c $pp/zebra.cfg -l $LOG init || exit 1
-../../index/zebraidx -c $pp/zebra.cfg -l $LOG update $pp/simple1.xml || exit 1
-
-echo "Starting server " >> $LOG
-../../index/zebrasrv -c $pp/zebra.cfg -l $LOG -S unix:socket &
-sleep 1
-test -f zebrasrv.pid || exit 2
-
-../api/testclient unix:socket -c 0 '@attr 1=/sgml/tag before' >> $LOG || exit 1
-../api/testclient unix:socket -c 1 '@attr 1=/sgml/tag inside' >> $LOG || exit 1
-../api/testclient unix:socket -c 0 '@attr 1=/sgml/tag after'  >> $LOG || exit 1
-
-../api/testclient unix:socket -c 0 '@attr 1=/sgml/none after'  >> $LOG || exit 1
-
-../api/testclient unix:socket -c 1 '@attr 1=/sgml before' >> $LOG || exit 1
-../api/testclient unix:socket -c 1 '@attr 1=/sgml inside' >> $LOG || exit 1
-../api/testclient unix:socket -c 1 '@attr 1=/sgml after'  >> $LOG || exit 1
-
-echo "killing server " >> $LOG
-kill `cat zebrasrv.pid` || exit 3
-echo ok >> $LOG
diff --git a/test/xpath/simple1.xml b/test/xpath/simple1.xml
deleted file mode 100644
index 7a46f7d..0000000
--- a/test/xpath/simple1.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<sgml>
-  before
-  <tag>
-    inside
-  </tag>
-  after
-</sgml>
-
-
diff --git a/test/xpath/test1.sh b/test/xpath/test1.sh
deleted file mode 100755
index d2b5206..0000000
--- a/test/xpath/test1.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-# $Id: test1.sh,v 1.5 2004-06-15 09:43:34 adam Exp $
-
-pp=${srcdir:-"."}
-
-LOG=test1.log
-rm -f $LOG
-../../index/zebraidx -c $pp/zebra.cfg -l $LOG init || exit 1
-../../index/zebraidx -c $pp/zebra.cfg -l $LOG -t grs.sgml update $pp/rec.xml || exit 2
diff --git a/test/xpath/test2.sh b/test/xpath/test2.sh
deleted file mode 100755
index d6068af..0000000
--- a/test/xpath/test2.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# $Id: test2.sh,v 1.5 2004-06-15 09:43:34 adam Exp $
-
-pp=${srcdir:-"."}
-
-LOG=test2.log
-TMP=test2.tmp
-rm -f $LOG
-rm -f $TMP
-../../index/zebraidx -c $pp/zebra.cfg -l $LOG init || exit 1
-../../index/zebraidx -c $pp/zebra.cfg -l $LOG -t grs.sgml update $pp/rec.xml || exit 2
-test -f dict*.mf || exit 1
-../../index/zebrasrv -c $pp/zebra.cfg -l $LOG -S unix:socket & 
-sleep 1
-test -f zebrasrv.pid || exit 2
-../api/testclient unix:socket '@attr 1=/Zthes/termName Sauropoda' >$TMP
-echo 'Killing server' >>$LOG
-kill `cat zebrasrv.pid` || exit 3
-cat $TMP >>$LOG
-echo 'Checking that result count is 1' >>$LOG
-grep "^Result count: 1$" $TMP >/dev/null || exit 4
-echo 'Test OK' >>$LOG
-
diff --git a/test/xpath/test3.sh b/test/xpath/test3.sh
deleted file mode 100755
index 61ca519..0000000
--- a/test/xpath/test3.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# $Id: test3.sh,v 1.5 2004-06-15 09:43:34 adam Exp $
-
-pp=${srcdir:-"."}
-
-LOG=test3.log
-TMP=test3.tmp
-rm -f $LOG
-rm -f $TMP
-../../index/zebraidx -c $pp/zebra.cfg -l $LOG init || exit 1
-../../index/zebraidx -c $pp/zebra.cfg -l $LOG -t grs.sgml update $pp/rec.xml || exit 2
-test -f dict*.mf || exit 1
-../../index/zebrasrv -c $pp/zebra.cfg -l $LOG -S unix:socket & 
-sleep 1
-test -f zebrasrv.pid || exit 2
-../api/testclient unix:socket '@attr 1=/Zthes/relation/termName Sauropoda' >$TMP
-echo 'Killing server' >>$LOG
-kill `cat zebrasrv.pid` || exit 3
-cat $TMP >>$LOG
-echo 'Checking that result count is 1' >>$LOG
-grep "^Result count: 1$" $TMP >/dev/null || exit 4
-echo 'Test OK' >>$LOG
-
diff --git a/test/xpath/test4.sh b/test/xpath/test4.sh
deleted file mode 100755
index 99f3b8b..0000000
--- a/test/xpath/test4.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-# $Id: test4.sh,v 1.3 2004-06-15 09:43:34 adam Exp $
-
-pp=${srcdir:-"."}
-
-LOG=test4.log
-TMP1=test4-1.tmp
-TMP2=test4-2.tmp
-TMP3=test4-3.tmp
-TMP4=test4-4.tmp
-TMP5=test4-5.tmp
-rm -f $LOG
-rm -f $TMP
-../../index/zebraidx -c $pp/zebra.cfg -l $LOG init || exit 1
-../../index/zebraidx -c $pp/zebra.cfg -l $LOG -t grs.sgml update $pp/rec4.xml || exit 2
-test -f dict*.mf || exit 1
-../../index/zebrasrv -c $pp/zebra.cfg -l $LOG -S unix:socket & 
-sleep 1
-test -f zebrasrv.pid || exit 2
-../api/testclient unix:socket '@attr 1=/root content' >$TMP1
-../api/testclient unix:socket '@attr 1=/root/first content' >$TMP2
-../api/testclient unix:socket "@attr {1=/root/first[@attr='danish']} content" >$TMP3
-../api/testclient unix:socket "@attr {1=/root/second[@attr='danish lake']} content" >$TMP4
-../api/testclient unix:socket "@attr {1=/root/third[@attr='dansk sø']} content" >$TMP5
-echo 'Killing server' >>$LOG
-kill `cat zebrasrv.pid` || exit 3
-cat $TMP1 $TMP2 $TMP3 $TMP4 $TMP5 >>$LOG
-echo 'Checking that result count is 1' >>$LOG
-grep "^Result count: 1$" $TMP1 >/dev/null || exit 4
-echo 'Checking that result count is 1' >>$LOG
-grep "^Result count: 1$" $TMP2 >/dev/null || exit 5
-echo 'Checking that result count is 1' >>$LOG
-grep "^Result count: 1$" $TMP3 >/dev/null || exit 6
-echo 'Checking that result count is 1' >>$LOG
-grep "^Result count: 1$" $TMP4 >/dev/null || exit 7
-echo 'Checking that result count is 1' >>$LOG
-grep "^Result count: 1$" $TMP5 >/dev/null || exit 8
-echo 'Test OK' >>$LOG
-exit 0
-
diff --git a/test/xpath/test5.sh b/test/xpath/test5.sh
deleted file mode 100755
index bbf067c..0000000
--- a/test/xpath/test5.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-# $Id: test5.sh,v 1.3 2004-06-15 09:43:34 adam Exp $
-
-pp=${srcdir:-"."}
-
-LOG="test5.log"
-TMP="test5.tmp"
-DBG="-v 1647"
-rm -f $LOG
-rm -f $TMP.*
-../../index/zebraidx -c $pp/zebra.cfg -l $LOG init || exit 1
-../../index/zebraidx -c $pp/zebra.cfg -l $LOG -t grs.sgml update $pp/rec5.xml || exit 2
-test -f dict*.mf || exit 1
-../../index/zebrasrv -c $pp/zebra.cfg -l $LOG $DBG -S unix:socket & 
-sleep 1
-test -f zebrasrv.pid || exit 2
-../api/testclient unix:socket '@attr 1=/record/title foo' >$TMP.1
-../api/testclient unix:socket '@attr 1=/record/title bar' >$TMP.2
-../api/testclient unix:socket "@attr {1=/record/title[@lang='da']} foo" >$TMP.3
-../api/testclient unix:socket "@attr {1=/record/title[@lang='en']} foo" >$TMP.4
-../api/testclient unix:socket "@attr 1=/record/title @and foo bar" >$TMP.5
-# The last one returns two hits, as the and applies to the whole
-# record, so it matches <title>foo</title><title>bar</title>
-# This might not have to be like that, but currently that is what
-# zebra does.
-../api/testclient unix:socket "@attr 1=/record/value bar" >$TMP.6
-../api/testclient unix:socket "@and @attr 1=/record/title foo @attr 1=/record/title grunt" >$TMP.7
-
-echo 'Killing server' >>$LOG
-kill `cat zebrasrv.pid` || exit 3
-sleep 1
-echo "Result counts: " >> $LOG
-cat $TMP.* >>$LOG
-echo 'Checking that result count is 4' >>$LOG
-grep "^Result count: 4$" $TMP.1 >/dev/null || exit 4
-echo 'Checking that result count is 2' >>$LOG
-grep "^Result count: 2$" $TMP.2 >/dev/null || exit 5
-echo 'Checking that result count is 1' >>$LOG
-grep "^Result count: 1$" $TMP.3 >/dev/null || exit 6
-echo 'Checking that result count is 1' >>$LOG
-grep "^Result count: 1$" $TMP.4 >/dev/null || exit 7
-echo 'Checking that result count is 2' >>$LOG
-grep "^Result count: 2$" $TMP.5 >/dev/null || exit 8
-echo 'Checking that result count is 1' >>$LOG
-grep "^Result count: 1$" $TMP.6 >/dev/null || exit 8
-echo 'Checking that result count is 1' >>$LOG
-grep "^Result count: 1$" $TMP.7 >/dev/null || exit 8
-echo 'Test OK' >>$LOG
-exit 0
-
diff --git a/test/xpath/zebra.cfg b/test/xpath/zebra.cfg
deleted file mode 100644
index 8867f55..0000000
--- a/test/xpath/zebra.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-# $Id: zebra.cfg,v 1.4 2004-06-15 09:43:34 adam Exp $
-profilePath: ${srcdir:-.}/../../tab
-recordType: grs.sgml
-attset: bib1.att
-
-isam:b
-
-
-
-
diff --git a/test/xpath/zthes-b.est b/test/xpath/zthes-b.est
deleted file mode 100644
index 0624b3d..0000000
--- a/test/xpath/zthes-b.est
+++ /dev/null
@@ -1,2 +0,0 @@
-simpleelement (3,termId)
-simpleelement (3,relation)/(3,termName)
-- 
1.7.10.4