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

diff --git a/test/sort/sort1.c b/test/sort/sort1.c
index 3ce5353..661570d 100644
--- a/test/sort/sort1.c
+++ b/test/sort/sort1.c
@@ -1,5 +1,5 @@
-/* $Id: sort1.c,v 1.4 2005-05-04 10:50:09 adam Exp $
-   Copyright (C) 1995-2005
+/* $Id: sort1.c,v 1.13 2007-01-15 15:10:24 adam Exp $
+   Copyright (C) 1995-2007
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -15,84 +15,65 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  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)
+static void tst(int argc, char **argv)
 {
-    ZebraService zs = start_up(0, argc, argv);
-    ZebraHandle  zh = zebra_open(zs);
+    ZebraService zs = tl_start_up(0, argc, argv);
+    ZebraHandle  zh = zebra_open(zs, 0);
     zint ids[5];
     char path[256];
     int i;
 
-    zebra_select_database(zh, "Default");
+    YAZ_CHECK_EQ(zebra_select_database(zh, "Default"), ZEBRA_OK);
 
     zebra_init(zh);
 
-    zebra_begin_trans(zh, 1);
+    YAZ_CHECK(zebra_begin_trans(zh, 1) == ZEBRA_OK);
     for (i = 1; i <= 4; i++)
     {
-        sprintf(path, "%.200s/rec%d.xml", get_srcdir(), i);
+        sprintf(path, "%.200s/rec%d.xml", tl_get_srcdir(), i);
         zebra_repository_update(zh, path);
     }
-    zebra_end_trans(zh);
+    YAZ_CHECK(zebra_end_trans(zh) == ZEBRA_OK);
     zebra_commit(zh);
 
     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);
+    YAZ_CHECK(tl_sort(zh, "@or @attr 1=4 computer @attr 7=1 @attr 1=30 0", 4, ids));
+    YAZ_CHECK(tl_sort(zh, "@or @attr 1=4 computer @attr 7=1 @attr 1=Date 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);
+    YAZ_CHECK(tl_sort(zh, "@or @attr 1=4 computer @attr 7=1 @attr 1=1021 0", 4, ids));
+    YAZ_CHECK(tl_sort(zh, "@or @attr 1=4 computer @attr 7=1 @attr 1=Bib-Level 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);
+    YAZ_CHECK(tl_sort(zh, "@or @attr 1=4 computer @attr 7=1 @attr 1=1021 @attr 4=109 0", 4, ids));
+    YAZ_CHECK(tl_sort(zh, "@or @attr 1=4 computer @attr 7=1 @attr 1=Bib-Level @attr 4=109 0", 4, ids));
 
-    return close_down(zh, zs, 0);
+    YAZ_CHECK(tl_close_down(zh, zs));
 }
+
+
+TL_MAIN
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+