Fix sort test

diff --git a/test/sort/default.idx b/test/sort/default.idx
index 705795c..744524c 100644 (file)
--- a/test/sort/default.idx
+++ b/test/sort/default.idx
@@ -1,5 +1,5 @@
 # Zebra indexes as referred to from the *.abs-files.
 # Zebra indexes as referred to from the *.abs-files.

-#  $Id: default.idx,v 1.1 2004-07-28 09:47:41 adam Exp $
+#  $Id: default.idx,v 1.2 2004-07-28 11:01:58 adam Exp $

 #
 
 # Traditional word index
 #
 
 # Traditional word index

@@ -48,8 +48,8 @@ index d
 completeness 0
 charmap @
 
 completeness 0
 charmap @
 

-# Sort register as usual but specify another map : string-cut.
+# Sort register as usual but specify another map : string-hat.

 sort s
 completeness 1
 sort s
 completeness 1

-charmap string-cut.chr
+charmap string-hat.chr

 
 

diff --git a/test/sort/rec3.xml b/test/sort/rec3.xml
index a83e15a..4d6542f 100644 (file)
--- a/test/sort/rec3.xml
+++ b/test/sort/rec3.xml
@@ -1,3 +1,4 @@
 <my>
   <title>3rd computer</title>
 <my>
   <title>3rd computer</title>

+  <dateTime>a^3</dateTime>

 </my>
 </my>

diff --git a/test/sort/rec4.xml b/test/sort/rec4.xml
index c187216..998aaaa 100644 (file)
--- a/test/sort/rec4.xml
+++ b/test/sort/rec4.xml
@@ -1,3 +1,4 @@
 <my>
 <my>

-  <title>third ^computer</title>
+  <title>fourth computer</title>
+  <dateTime>4</dateTime>

 </my>
 </my>

diff --git a/test/sort/test1.sh b/test/sort/test1.sh
index 7be1269..1e06ca7 100755 (executable)
--- a/test/sort/test1.sh
+++ b/test/sort/test1.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 #!/bin/sh

-# $Id: test1.sh,v 1.8 2004-07-28 09:47:41 adam Exp $
+# $Id: test1.sh,v 1.9 2004-07-28 11:01:58 adam Exp $

 
 pp=${srcdir:-"."}
 
 
 pp=${srcdir:-"."}
 

@@ -19,15 +19,17 @@ test -f lock/zebrasrv.pid || exit 2
 ../api/testclient -n4 unix:socket '@or computer @attr 7=1 @attr 1=30 0' >tmp1
 echo 'Result count: 4
 my:
 ../api/testclient -n4 unix:socket '@or computer @attr 7=1 @attr 1=30 0' >tmp1
 echo 'Result count: 4
 my:

-  title: 3rd computer
-my:
-  title: third ^computer
-my:

   title: second computer
   dateTime: 1
 my:
   title: first computer
   title: second computer
   dateTime: 1
 my:
   title: first computer

-  dateTime: 2' >tmp2
+  dateTime: 2
+my:
+  title: 3rd computer
+  dateTime: a^3
+my:
+  title: fourth computer
+  dateTime: 4' >tmp2

 
 kill `cat lock/zebrasrv.pid`
 diff tmp1 tmp2
 
 kill `cat lock/zebrasrv.pid`
 diff tmp1 tmp2