X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=test%2Fapi%2Ft9.c;h=8cba20a41d6764501a7c0a46e28b62a2f946cd0a;hp=f22cfdbd86fecb8b7c2feef30ed8fcb84d8dd887;hb=c33ea56e3771c3b80ba66ef8fda3a09cad171ebb;hpb=2fefff35eeb40ba802bb3ee11674a6037b84659c

diff --git a/test/api/t9.c b/test/api/t9.c
index f22cfdb..8cba20a 100644
--- a/test/api/t9.c
+++ b/test/api/t9.c
@@ -1,6 +1,6 @@
-/* $Id: t9.c,v 1.1 2004-10-28 10:37:15 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
+/* $Id: t9.c,v 1.12 2006-09-08 14:40:57 adam Exp $
+   Copyright (C) 1995-2006
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -15,71 +15,39 @@ 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
+
 */
 
 /** t9.c - test rank-1 */
 
-#include <yaz/log.h>
-#include <yaz/pquery.h>
-#include <idzebra/api.h>
 #include "testlib.h"
-#include "rankingrecords.h"
 
-#define qry(zh,query,hits,string,score) \
-    RankingQuery(__LINE__,(zh),(query),(hits),(string),(score))
+#include "rankingrecords.h"
 
-int main(int argc, char **argv)
+static void tst(int argc, char **argv)
 {
-    int i;
-    char *addinfo;
-    ZebraService zs;
-    ZebraHandle zh;
-
-    yaz_log_init_file("t9.log");
-    /* yaz_log_init_level(LOG_ALL); */
+    ZebraService zs = tl_start_up(0, argc, argv);
+    ZebraHandle zh = zebra_open(zs, 0);
 
-    nmem_init ();
+    YAZ_CHECK(tl_init_data(zh, recs));
     
-    zs = start_service(""); /* default to zebra.cfg */
-    zh = zebra_open (zs);
-    zebra_select_database(zh, "Default");
-    logf(LOG_LOG,"going to call init");
-    i=zebra_init(zh);
-    logf(LOG_LOG,"init returned %d",i);
-    if (i) {
-        printf("init failed with %d\n",i);
-        zebra_result(zh, &i, &addinfo);
-        printf("  Error %d   %s\n",i,addinfo);
-        exit(1);
-    }
-
-    zebra_begin_trans (zh, 1);
-    for (i = 0; recs[i]; i++)
-	zebra_add_record (zh, recs[i], strlen(recs[i]));
-    zebra_end_trans (zh);
-
-    zebra_select_database(zh, "Default");
-
-    qry( zh, "@attr 1=1016 @attr 2=102 the",
-            3, "first title", 872 );
-
-    qry( zh, "@attr 1=1016 @attr 2=102 foo",
-            3, "second title", 850 );
-
-    /* get the record with the most significant hit, that is the 'bar' */
-    /* as that is the rarest of my search words */
-    qry( zh, "@attr 1=1016 @attr 2=102 @or @or the foo bar",
-            3, "third title", 895 );
-
+    YAZ_CHECK(tl_ranking_query(zh, "@attr 1=4 @attr 2=102 the",
+			       3, "first title", 936 ));
     
-    zebra_commit (zh);
-    zebra_close (zh);
-    zebra_stop (zs);
-
-    nmem_exit ();
-    xmalloc_trav ("x");
-    exit (0);
+    YAZ_CHECK(tl_ranking_query(zh, "@attr 1=62 @attr 2=102 foo",
+			       3, "second title", 850 ));
+    
+    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
+ */
+