X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=test%2Fapi%2Ft5.c;h=30ccd1f6d8a84aa67b67fbc0c94b69b51b90215a;hp=71636501688f647c5e0940fb67d47324ae28b43a;hb=6c9fcd3b5d3108702fa1ffc92dab4ab6060f9a19;hpb=2e4e9c6def27f1e1463dcb6f205fab6a98054f38

diff --git a/test/api/t5.c b/test/api/t5.c
index 7163650..30ccd1f 100644
--- a/test/api/t5.c
+++ b/test/api/t5.c
@@ -1,6 +1,6 @@
-/* $Id: t5.c,v 1.5 2004-08-04 08:35:26 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
+/* $Id: t5.c,v 1.11 2005-01-15 19:38:35 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -20,90 +20,45 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 */
 
-#include <yaz/log.h>
-#include <yaz/pquery.h>
-#include <zebraapi.h>
+/** t5.c: proximity searches */
+#include "testlib.h"
 
-/* read zebra.cfg from env var srcdir if it exists; otherwise current dir */
-static ZebraService start_service()
-{
-    char cfg[256];
-    char *srcdir = getenv("srcdir");
-    sprintf(cfg, "%.200s%szebra.cfg", srcdir ? srcdir : "", srcdir ? "/" : "");
-    return zebra_start(cfg);
-}
-	
-static void expect(ZebraHandle zh, const char *pqf, int hits_expect,
-		   int *exit_code)
-{
-    int hits;
-    if (zebra_search_PQF (zh, pqf, "set1", &hits) != 0)
-    {
-        yaz_log(LOG_FATAL, "Search %s: failed", pqf);
-        *exit_code = 1;
-    }
-    else if (hits != hits_expect)
-    {
-        yaz_log(LOG_FATAL, "Search %s: Expected %d, got %d", pqf,
-		hits_expect, hits);
-        *exit_code = 2;
-    }
-}
-
-int main(int argc, char **argv)
-{
-    int i;
-    int exit_code = 0;
-    ZebraService zs;
-    ZebraHandle zh;
-    const char *myrec[] = {
+const char *myrec[] = {
         "<gils>\n<title>My title</title>\n</gils>\n",
         "<gils>\n<title>My x title</title>\n</gils>\n",
         "<gils>\n<title>My title x</title>\n</gils>\n" ,
-	0}
-    ;
-
-    yaz_log_init_file("t5.log");
+	0} ;
+	
 
-    nmem_init ();
-    
-    zs = start_service();
-    zh = zebra_open (zs);
-    zebra_select_database(zh, "Default");
-    zebra_init(zh);
+int main(int argc, char **argv)
+{
+    ZebraService zs = start_up(0, argc, argv);
+    ZebraHandle zh = zebra_open(zs);
 
-    zebra_begin_trans (zh, 1);
-    for (i = 0; myrec[i]; i++)
-	zebra_add_record (zh, myrec[i], strlen(myrec[i]));
-    zebra_end_trans (zh);
+    init_data(zh, myrec);
 
-    expect(zh, "@attr 1=4 my", 3, &exit_code);
-    expect(zh, "@attr 1=4 {my x}", 1, &exit_code);
-    expect(zh, "@attr 1=4 {my x}", 1, &exit_code);
-    expect(zh, "@attr 1=4 {x my}", 0, &exit_code);
-    expect(zh, "@attr 1=4 {my x title}", 1, &exit_code);
-    expect(zh, "@attr 1=4 {my title}", 2, &exit_code);
-    expect(zh, "@attr 1=4 @and x title", 2, &exit_code);
+    do_query(__LINE__,zh, "@attr 1=4 my", 3);
+    do_query(__LINE__,zh, "@attr 1=4 {my x}", 1);
+    do_query(__LINE__,zh, "@attr 1=4 {my x}", 1);
+    do_query(__LINE__,zh, "@attr 1=4 {x my}", 0);
+    do_query(__LINE__,zh, "@attr 1=4 {my x title}", 1);
+    do_query(__LINE__,zh, "@attr 1=4 {my title}", 2);
+    do_query(__LINE__,zh, "@attr 1=4 @and x title", 2);
 
     /* exl=0 distance=2 order=1 relation=2 (<=), known, unit=word */
-    expect(zh, "@prox 0 2 1 2 k 2 my x", 2, &exit_code);
+    do_query(__LINE__,zh, "@prox 0 2 1 2 k 2 my x", 2);
 
     /* exl=0 distance=2 order=1 relation=2 (<=), known, unit=word */
-    expect(zh, "@prox 0 2 1 2 k 2 x my", 0, &exit_code);
+    do_query(__LINE__,zh, "@prox 0 2 1 2 k 2 x my", 0);
 
     /* exl=0 distance=2 order=0 relation=2 (<=), known, unit=word */
-    expect(zh, "@prox 0 2 0 2 k 2 x my", 2, &exit_code);
+    do_query(__LINE__,zh, "@prox 0 2 0 2 k 2 x my", 2);
 
     /* exl=0 distance=2 order=0 relation=3 (=), known, unit=word */
-    expect(zh, "@prox 0 2 1 3 k 2 my x", 1, &exit_code);
+    do_query(__LINE__,zh, "@prox 0 2 1 3 k 2 my x", 1);
 
     /* exl=1 distance=2 order=0 relation=3 (=), known, unit=word */
-    expect(zh, "@prox 1 2 1 3 k 2 my x", 1, &exit_code);
-
-    zebra_close (zh);
-    zebra_stop (zs);
+    do_query(__LINE__,zh, "@prox 1 2 1 3 k 2 my x", 1);
 
-    nmem_exit ();
-    xmalloc_trav ("x");
-    exit (exit_code);
+    return close_down(zh, zs, 0);
 }