X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fapi%2Ft7.c;h=f943cbe7bc1a0a8bac63cbc5aac9c83854f5fca2;hb=e172ced0dcc937dfc433a33c7e20962b9e6b5ea0;hp=d59cc79b509a165d92bf52efb2622115e69a1ba4;hpb=d648cf738190682df2314f3fc3ef5a9e0396724c;p=idzebra-moved-to-github.git

diff --git a/test/api/t7.c b/test/api/t7.c
index d59cc79..f943cbe 100644
--- a/test/api/t7.c
+++ b/test/api/t7.c
@@ -1,4 +1,4 @@
-/* $Id: t7.c,v 1.1 2004-09-22 11:59:25 heikki Exp $
+/* $Id: t7.c,v 1.4 2004-10-29 13:02:39 heikki Exp $
    Copyright (C) 2004
    Index Data Aps
 
@@ -20,29 +20,23 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 */
 
-#include <yaz/log.h>
-#include <yaz/pquery.h>
+/** t7.c sorting  */
+
+#include "testlib.h"
 #include <yaz/sortspec.h>
-#include <idzebra/api.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);
-}
-	
-int main(int argc, char **argv)
-{
-    int i;
-    ZebraService zs;
-    ZebraHandle zh;
-    const char *myrec =
+const char *recs[] = {
         "<gils>\n"
         "  <title>My title</title>\n"
-        "</gils>\n";
+        "</gils>\n",
+        0};
+
+
+int main(int argc, char **argv)
+{
+    ZebraService zs = start_up(0, argc, argv);
+    ZebraHandle  zh = zebra_open (zs);
+
     const char *setname1="set1";
     const char *setname2="set2";
     const char *setname3="set3";
@@ -57,27 +51,26 @@ int main(int argc, char **argv)
           yaz_sort_spec (odr_output, "@attr 1=4 id");
     int hits;
 
-    yaz_log_init_file("t7.log");
+    init_data(zh,recs);
 
-    nmem_init ();
-    
-    zs = start_service();
-    zh = zebra_open (zs);
-    zebra_select_database(zh, "Default");
-    zebra_init(zh);
-
-    zebra_begin_trans (zh, 1);
-    zebra_add_record (zh, myrec, strlen(myrec));
-    zebra_end_trans (zh);
 
     zebra_begin_trans (zh, 0);
         
     zebra_search_RPN (zh, odr_input, query, setname1, &hits);
 
     rc=zebra_sort(zh, odr_output, 1, &setname1, setname2, spec, &status);
-    if (rc) { printf("sort A returned %d %d \n",rc,status); exit(1);}
+    if (rc) 
+    { 
+        printf("sort A returned %d %d \n",rc,status); 
+        exit(1);
+    }
+    
     rc=zebra_sort(zh, odr_output, 1, &setname2, setname3, spec, &status);
-    if (rc) { printf("sort B returned %d %d \n",rc,status); exit(1);}
+    if (rc) 
+    { 
+        printf("sort B returned %d %d \n",rc,status); 
+        exit(1);
+    }
 
     zebra_end_trans (zh);
     yaz_pqf_destroy(parser);
@@ -85,15 +78,11 @@ int main(int argc, char **argv)
     /*
      zebra_deleleResultSet(zh, Z_DeleteRequest_list,
                           1, &setnamep, &status);
-    */
+    */  
     odr_destroy (odr_input);
     odr_destroy (odr_output);
 
     zebra_commit (zh);
-    zebra_close (zh);
-    zebra_stop (zs);
 
-    nmem_exit ();
-    xmalloc_trav ("x");
-    exit (0);
+    return close_down(zh,zs,0);
 }