X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fsort%2Fsort1.c;h=2b4d8aa92e739a8695744634bab566f297b4d1b5;hb=aed917ab8001642c774a55a4a4fffe9a26887a52;hp=3ce5353bcae220b386ef4cf945667097547dc0f3;hpb=1f1106ca4cb980d93dec90480e25df75ddd59c4d;p=idzebra-moved-to-github.git

diff --git a/test/sort/sort1.c b/test/sort/sort1.c
index 3ce5353..2b4d8aa 100644
--- a/test/sort/sort1.c
+++ b/test/sort/sort1.c
@@ -1,4 +1,4 @@
-/* $Id: sort1.c,v 1.4 2005-05-04 10:50:09 adam Exp $
+/* $Id: sort1.c,v 1.6 2005-09-13 11:51:09 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -23,42 +23,10 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #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);
+    ZebraHandle  zh = zebra_open(zs, 0);
     zint ids[5];
     char path[256];
     int i;
@@ -80,19 +48,19 @@ int main(int argc, char **argv)
     ids[1] = 2;
     ids[2] = 4;
     ids[3] = 5;
-    sort(zh, "@or computer @attr 7=1 @attr 1=30 0", 4, ids);
+    do_sort(zh, "@or computer @attr 7=1 @attr 1=30 0", 4, ids);
 
     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);
+    do_sort(zh, "@or computer @attr 7=1 @attr 1=1021 0", 4, ids);
 
     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);
+    do_sort(zh, "@or computer @attr 7=1 @attr 1=1021 @attr 4=109 0", 4, ids);
 
     return close_down(zh, zs, 0);
 }