X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=test%2Fsort%2Fsort1.c;h=2b4d8aa92e739a8695744634bab566f297b4d1b5;hb=3d3d0cebd23fa527a7e9d5d728e3c744acb37580;hp=6b09f259998d88fe5421bbe146cca93809b99563;hpb=8f170520029ded9cf0b7600f5ae07ecf73a9a34d;p=idzebra-moved-to-github.git

diff --git a/test/sort/sort1.c b/test/sort/sort1.c
index 6b09f25..2b4d8aa 100644
--- a/test/sort/sort1.c
+++ b/test/sort/sort1.c
@@ -1,6 +1,6 @@
-/* $Id: sort1.c,v 1.1 2004-12-02 15:02:52 adam Exp $
-   Copyright (C) 2003,2004
-   Index Data Aps
+/* $Id: sort1.c,v 1.6 2005-09-13 11:51:09 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -20,50 +20,47 @@ 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;
+    ZebraHandle  zh = zebra_open(zs, 0);
+    zint ids[5];
     char path[256];
-    int errs = 0;
+    int i;
 
     zebra_select_database(zh, "Default");
 
     zebra_init(zh);
 
     zebra_begin_trans(zh, 1);
-    sprintf(path, "%.200s/recs", get_srcdir());
-    zebra_repository_update(zh, path);
+    for (i = 1; i <= 4; i++)
+    {
+        sprintf(path, "%.200s/rec%d.xml", get_srcdir(), i);
+        zebra_repository_update(zh, path);
+    }
     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++;
+    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);
 
-    zebra_meta_records_destroy (zh, recs, 4);
-
-    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);
 }