Using zint for testlib hits. Extended sort test to test for bug #316.

diff --git a/test/api/testlib.c b/test/api/testlib.c
index ba28301..7b7efca 100644 (file)
--- a/test/api/testlib.c
+++ b/test/api/testlib.c
@@ -1,4 +1,4 @@
-/* $Id: testlib.c,v 1.17 2005-05-03 09:07:17 adam Exp $
+/* $Id: testlib.c,v 1.18 2005-05-04 10:50:09 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -139,8 +139,8 @@ void init_data(ZebraHandle zh, const char **recs)
 
 }
 
-int do_query_x(int lineno, ZebraHandle zh, char *query, int exphits,
-             int experror)
+int do_query_x(int lineno, ZebraHandle zh, const char *query, zint exphits,
+              int experror)
 {
     ODR odr;
     YAZ_PQF_Parser parser;
@@ -188,7 +188,7 @@ int do_query_x(int lineno, ZebraHandle zh, char *query, int exphits,
        }
        if (exphits != -1 && hits != exphits) {
            printf("Error: search returned " ZINT_FORMAT 
-                  " hits instead of %d\n%s\n",
+                  " hits instead of " ZINT_FORMAT "\n%s\n",
                   hits, exphits, query);
            exit (1);
        }
@@ -198,7 +198,7 @@ int do_query_x(int lineno, ZebraHandle zh, char *query, int exphits,
 }
 
 
-int do_query(int lineno, ZebraHandle zh, char *query, int exphits)
+int do_query(int lineno, ZebraHandle zh, const char *query, zint exphits)
 {
     return do_query_x(lineno, zh, query, exphits, 0);
 }

diff --git a/test/api/testlib.h b/test/api/testlib.h
index 304c60f..cbe06cc 100644 (file)
--- a/test/api/testlib.h
+++ b/test/api/testlib.h
@@ -1,4 +1,4 @@
-/* $Id: testlib.h,v 1.13 2005-05-02 09:05:22 adam Exp $
+/* $Id: testlib.h,v 1.14 2005-05-04 10:50:09 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -76,13 +76,13 @@ void init_data(ZebraHandle zh, const char **recs);
 /**
  * do_query does a simple query, and checks that the number of hits matches
  */
-int do_query(int lineno, ZebraHandle zh, char *query, int exphits);
+int do_query(int lineno, ZebraHandle zh, const char *query, zint exphits);
 
 
 /**
  * do_query does a simple query, and checks that error is what is expected
  */
-int do_query_x(int lineno, ZebraHandle zh, char *query, int exphits,
+int do_query_x(int lineno, ZebraHandle zh, const char *query, zint exphits,
               int experror);
 
 /**

diff --git a/test/sort/default.idx b/test/sort/default.idx
index 744524c..4dbbfbb 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.
-#  $Id: default.idx,v 1.2 2004-07-28 11:01:58 adam Exp $
+#  $Id: default.idx,v 1.3 2005-05-04 10:50:09 adam Exp $
 #
 
 # Traditional word index
@@ -53,3 +53,7 @@ sort s
 completeness 1
 charmap string-hat.chr
 
+# Sort register with no map
+sort S
+completeness 1
+charmap @

diff --git a/test/sort/my.abs b/test/sort/my.abs
index 1ade037..b6be503 100644 (file)
--- a/test/sort/my.abs
+++ b/test/sort/my.abs
@@ -1,4 +1,4 @@
-# $Id: my.abs,v 1.1 2002-12-10 12:54:24 adam Exp $
+# $Id: my.abs,v 1.2 2005-05-04 10:50:09 adam Exp $
 
 name my
 reference WAIS-schema
@@ -12,3 +12,4 @@ esetname F @
 
 elm (2,1)              Title                   !:p,!:w
 elm (2,8)              Date                    !:s
+elm (2,26)             Cost                    Bib-level:S

diff --git a/test/sort/rec1.xml b/test/sort/rec1.xml
index 781d74a..c167bf5 100644 (file)
--- a/test/sort/rec1.xml
+++ b/test/sort/rec1.xml
@@ -1,4 +1,5 @@
 <my>
   <title>first computer</title>
   <dateTime>2</dateTime>
+  <cost>2</cost>
 </my>

diff --git a/test/sort/rec2.xml b/test/sort/rec2.xml
index fa58c19..d512f84 100644 (file)
--- a/test/sort/rec2.xml
+++ b/test/sort/rec2.xml
@@ -1,4 +1,5 @@
 <my>
   <title>second computer</title>
   <dateTime>1</dateTime>
+  <cost>21</cost>
 </my>

diff --git a/test/sort/rec3.xml b/test/sort/rec3.xml
index 4d6542f..41d7b95 100644 (file)
--- a/test/sort/rec3.xml
+++ b/test/sort/rec3.xml
@@ -1,4 +1,5 @@
 <my>
   <title>3rd computer</title>
   <dateTime>a^3</dateTime>
+  <cost>15</cost>
 </my>

diff --git a/test/sort/rec4.xml b/test/sort/rec4.xml
index 998aaaa..b0ddd9f 100644 (file)
--- a/test/sort/rec4.xml
+++ b/test/sort/rec4.xml
@@ -1,4 +1,5 @@
 <my>
   <title>fourth computer</title>
   <dateTime>4</dateTime>
+  <cost>11</cost>
 </my>

diff --git a/test/sort/sort1.c b/test/sort/sort1.c
index 76c838e..3ce5353 100644 (file)
--- a/test/sort/sort1.c
+++ b/test/sort/sort1.c
@@ -1,4 +1,4 @@
-/* $Id: sort1.c,v 1.3 2005-01-15 19:38:39 adam Exp $
+/* $Id: sort1.c,v 1.4 2005-05-04 10:50:09 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -20,15 +20,48 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 */
 
+#include <assert.h>
 #include "../api/testlib.h"
 
+static void sort(ZebraHandle zh, const char *query, zint hits, zint *exp)
+{
+    ZebraMetaRecord *recs;
+    zint i;
+    int errs = 0;
+
+    assert(query);
+    do_query(__LINE__, zh, query, hits);
+
+    recs = zebra_meta_records_create_range (zh, "rsetname", 1, 4);
+    if (!recs)
+    {
+       fprintf(stderr, "recs==0\n");
+       exit(1);
+    }
+    for (i = 0; i<hits; i++)
+       if (recs[i].sysno != exp[i])
+           errs++;
+    if (errs)
+    {
+       printf("Sequence not in right order for query\n%s\ngot exp\n",
+              query);
+       for (i = 0; i<hits; i++)
+           printf(" " ZINT_FORMAT "   " ZINT_FORMAT "\n",
+                  recs[i].sysno, exp[i]);
+    }
+    zebra_meta_records_destroy (zh, recs, 4);
+
+    if (errs)
+       exit(1);
+}
+
 int main(int argc, char **argv)
 {
     ZebraService zs = start_up(0, argc, argv);
     ZebraHandle  zh = zebra_open(zs);
-    ZebraMetaRecord *recs;
+    zint ids[5];
     char path[256];
-    int i, errs = 0;
+    int i;
 
     zebra_select_database(zh, "Default");
 
@@ -43,30 +76,23 @@ int main(int argc, char **argv)
     zebra_end_trans(zh);
     zebra_commit(zh);
 
-    do_query(__LINE__,zh, "@or computer @attr 7=1 @attr 1=30 0", 4);
-
-    recs = zebra_meta_records_create_range (zh, "rsetname", 1, 4);
-    if (!recs)
-    {
-       fprintf(stderr, "recs==0\n");
-       exit(1);
-    }
-    if (recs[0].sysno != 3)
-       errs++;
-    if (recs[1].sysno != 2)
-       errs++;
-    if (recs[2].sysno != 4)
-       errs++;
-    if (recs[3].sysno != 5)
-       errs++;
+    ids[0] = 3;
+    ids[1] = 2;
+    ids[2] = 4;
+    ids[3] = 5;
+    sort(zh, "@or computer @attr 7=1 @attr 1=30 0", 4, ids);
 
-    zebra_meta_records_destroy (zh, recs, 4);
+    ids[0] = 5;
+    ids[1] = 4;
+    ids[2] = 2;
+    ids[3] = 3;
+    sort(zh, "@or computer @attr 7=1 @attr 1=1021 0", 4, ids);
 
-    if (errs)
-    {
-       fprintf(stderr, "%d sysnos did not match\n", errs);
-       exit(1);
-    }
+    ids[0] = 2;
+    ids[1] = 5;
+    ids[2] = 4;
+    ids[3] = 3;
+    sort(zh, "@or computer @attr 7=1 @attr 1=1021 @attr 4=109 0", 4, ids);
 
     return close_down(zh, zs, 0);
 }