X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fapi%2Ft10.c;h=4429132d61ea590c76f97edc7c9cd34512187646;hb=ecb3935e78cd9bcfdebafdee0834cfb1060d7b5e;hp=aae64dd42033ff4fbd2fa175af9e5ac598d13fb7;hpb=6c9fcd3b5d3108702fa1ffc92dab4ab6060f9a19;p=idzebra-moved-to-github.git

diff --git a/test/api/t10.c b/test/api/t10.c
index aae64dd..4429132 100644
--- a/test/api/t10.c
+++ b/test/api/t10.c
@@ -1,4 +1,4 @@
-/* $Id: t10.c,v 1.6 2005-01-15 19:38:35 adam Exp $
+/* $Id: t10.c,v 1.11 2006-05-10 08:13:35 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -25,9 +25,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "testlib.h"
 #include "rankingrecords.h"
 
-#define qry(zh,query,hits,string,score) \
-    ranking_query(__LINE__,(zh),(query),(hits),(string),(score))
-
 struct tst {
     char *schema;
     char *hit1;
@@ -38,67 +35,71 @@ struct tst {
     int score3;
 };
 
-
-
 struct tst tests[] = {
-    {"ntc-atn", "first title", 1000, "first title", 1000, "second title",862 },
-    {"ntc-ntn", "first title", 1000, "first title", 1000, "second title",862 },
-    {"ntc-btn", "first title", 1000, "first title", 1000, "second title",862 },
-    {"ntc-apn", "first title", 1000, "first title", 1000, "second title",862 },
-    {"ntc-npn", "first title", 1000, "first title", 1000, "second title",862 },
-    {"ntc-bpn", "first title", 1000, "first title", 1000, "second title",862 },
-
-    {"atc-atn", "first title", 1000, "first title", 1000, "second title", 989 },
-    {"atc-ntn", "first title", 1000, "first title", 1000, "second title", 989 },
-    {"atc-btn", "first title", 1000, "first title", 1000, "second title", 989 },
-    {"atc-apn", "first title", 1000, "first title", 1000, "second title", 989 },
-    {"atc-npn", "first title", 1000, "first title", 1000, "second title", 989 },
-    {"atc-bpn", "first title", 1000, "first title", 1000, "second title", 989 },
-
-    {"npc-atn", "first title", 1000, "first title", 1000, "second title", 862 },
-    {"npc-ntn", "first title", 1000, "first title", 1000, "second title", 862 },
-    {"npc-btn", "first title", 1000, "first title", 1000, "second title", 862 },
-    {"npc-apn", "first title", 1000, "first title", 1000, "second title", 862 },
-    {"npc-npn", "first title", 1000, "first title", 1000, "second title", 862 },
-    {"npc-bpn", "first title", 1000, "first title", 1000, "second title", 862 },
-
-    {"apc-atn", "first title", 1000, "first title", 1000, "second title", 989 },
-    {"apc-ntn", "first title", 1000, "first title", 1000, "second title", 989 },
-    {"apc-btn", "first title", 1000, "first title", 1000, "second title", 989 },
-    {"apc-apn", "first title", 1000, "first title", 1000, "second title", 989 },
-    {"apc-npn", "first title", 1000, "first title", 1000, "second title", 989 },
-    {"apc-bpn", "first title", 1000, "first title", 1000, "second title", 989 },
-
+    {"ntc-atn", "first title", 0, "first title", 1000, "first title",1000 },
+    {"ntc-ntn", "first title", 0, "first title", 1000, "first title",1000 },
+    {"ntc-btn", "first title", 0, "first title", 1000, "first title",1000 },
+    {"ntc-apn", "first title", 0,    "first title", 1000, "first title",1000 },
+    {"ntc-npn", "first title", 0,    "first title", 1000, "first title",1000 },
+    {"ntc-bpn", "first title", 0,    "first title", 1000, "first title",1000 },
+    {"atc-atn", "first title", 0,    "first title", 1000, "first title", 1000 },
+    {"atc-ntn", "first title", 0,    "first title", 1000, "first title", 1000 },
+    {"atc-btn", "first title", 0,    "first title", 1000, "first title", 1000 },
+    {"atc-apn", "first title", 0,    "first title", 1000, "first title", 1000 },
+    {"atc-npn", "first title", 0,    "first title", 1000, "first title", 1000 },
+    {"atc-bpn", "first title", 0,    "first title", 1000, "first title", 1000 },
+
+    {"npc-atn", "first title", 0,    "first title", 1000, "first title", 1000 },
+    {"npc-ntn", "first title", 0,    "first title", 1000, "first title", 1000 },
+    {"npc-btn", "first title", 0,    "first title", 1000, "first title", 1000 },
+    {"npc-apn", "first title", 0,    "first title", 1000, "first title", 1000 },
+    {"npc-npn", "first title", 0,    "first title", 1000, "first title", 1000 },
+    {"npc-bpn", "first title", 0,    "first title", 1000, "first title", 1000 },
+
+    {"apc-atn", "first title", 0,    "first title", 1000, "first title", 1000 },
+    {"apc-ntn", "first title", 0,    "first title", 1000, "first title", 1000 },
+    {"apc-btn", "first title", 0,    "first title", 1000, "first title", 1000 },
+    {"apc-apn", "first title", 0,    "first title", 1000, "first title", 1000 },
+    {"apc-npn", "first title", 0,    "first title", 1000, "first title", 1000 },
+    {"apc-bpn", "first title", 0,    "first title", 1000, "first title", 1000 },
     {0,0,0,0,0,0,0},
 };
 
-int main(int argc, char **argv)
+static void tst(int argc, char **argv)
 {
     int i;
-    ZebraService zs = start_up("zebrazv.cfg", argc, argv);
-    ZebraHandle  zh = zebra_open (zs);
+    ZebraService zs = tl_start_up("zebrazv.cfg", argc, argv);
+    ZebraHandle zh = zebra_open(zs, 0);
   
-    int loglevel=yaz_log_mask_str("zvrank,rank1,t10");
-    init_data(zh, recs);
+    YAZ_CHECK(tl_init_data(zh, recs));
     zebra_close(zh);
-    yaz_log_init_level(loglevel);
-    for (i=0; tests[i].schema; i++)
+    for (i = 0; tests[i].schema; i++)
     {
-        zh = zebra_open (zs);
-        zebra_select_database(zh, "Default");
-        zebra_set_resource(zh, "zvrank.weighting-scheme", tests[i].schema);
-        yaz_log(log_level,"============%d: %s ============", i,tests[i].schema);
-
-        ranking_query( __LINE__, zh, "@attr 1=1016 @attr 2=102 the",
-                3, tests[i].hit1, tests[i].score1);
-        ranking_query( __LINE__, zh, "@attr 1=1016 @attr 2=102 @or foo bar",
-                3, tests[i].hit2, tests[i].score2);
-        ranking_query( __LINE__, zh, 
-                "@attr 1=1016 @attr 2=102 @or @or the foo bar",
-                3, tests[i].hit3, tests[i].score3);
+        zh = zebra_open(zs, 0);
+	YAZ_CHECK(zh);
+        YAZ_CHECK(zebra_select_database(zh, "Default") == ZEBRA_OK);
 
+        zebra_set_resource(zh, "zvrank.weighting-scheme", tests[i].schema);
+        yaz_log(YLOG_LOG,"============%d: %s ===========", i, tests[i].schema);
+
+        YAZ_CHECK(tl_ranking_query(zh, "@attr 1=1016 @attr 2=102 the",
+				   3, tests[i].hit1, tests[i].score1));
+        YAZ_CHECK(tl_ranking_query(zh, "@attr 1=1016 @attr 2=102 @or foo bar",
+				   3, tests[i].hit2, tests[i].score2));
+        YAZ_CHECK(tl_ranking_query(zh, 
+				   "@attr 1=1016 @attr 2=102 @or @or the foo bar",
+				   3, tests[i].hit3, tests[i].score3));
         zebra_close(zh);
     }
-    
-    return close_down(0,zs,0);
+    YAZ_CHECK(tl_close_down(0, zs));
 }
+
+TL_MAIN
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+