X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fsort%2Fsort1.c;h=b86d22b3a80cf93f032c3ea8de9b9877bcd82dcc;hb=8e4994aae59602f0caabe147d8ebd65ec08d3e3a;hp=b34452951428afdfd59c6d0d1944c676ca4a74e5;hpb=b4a743f2f07e693a8863c99c670668db35b0ddbe;p=idzebra-moved-to-github.git

diff --git a/test/sort/sort1.c b/test/sort/sort1.c
index b344529..b86d22b 100644
--- a/test/sort/sort1.c
+++ b/test/sort/sort1.c
@@ -1,6 +1,6 @@
-/* $Id: sort1.c,v 1.2 2004-12-02 17:43:04 adam Exp $
-   Copyright (C) 2003,2004
-   Index Data Aps
+/* $Id: sort1.c,v 1.5 2005-08-09 12:30:47 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -20,15 +20,16 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 */
 
+#include <assert.h>
 #include "../api/testlib.h"
 
 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 +44,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);
+    ids[0] = 3;
+    ids[1] = 2;
+    ids[2] = 4;
+    ids[3] = 5;
+    do_sort(zh, "@or computer @attr 7=1 @attr 1=30 0", 4, ids);
 
-    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++;
-
-    zebra_meta_records_destroy (zh, recs, 4);
+    ids[0] = 5;
+    ids[1] = 4;
+    ids[2] = 2;
+    ids[3] = 3;
+    do_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;
+    do_sort(zh, "@or computer @attr 7=1 @attr 1=1021 @attr 4=109 0", 4, ids);
 
     return close_down(zh, zs, 0);
 }